projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c1bcfb d2fd05e)
[MERGE] forward port of branch 7.0 up to d2fd05e
authorChristophe Simonis <chs@odoo.com>
Fri, 24 Oct 2014 14:52:10 +0000 (16:52 +0200)
committerChristophe Simonis <chs@odoo.com>
Fri, 24 Oct 2014 14:52:10 +0000 (16:52 +0200)
1  2 
openerp/tools/config.py patch | diff1 | diff2 | blob | history

diff --cc openerp/tools/config.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.