projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6e48c89 309ca4f)
[MERGE] forward port of branch saas-3 up to 309ca4f
authorChristophe Simonis <chs@odoo.com>
Fri, 24 Oct 2014 15:25:19 +0000 (17:25 +0200)
committerChristophe Simonis <chs@odoo.com>
Fri, 24 Oct 2014 15:25:19 +0000 (17:25 +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.