projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 96db670 5d95027)
[MERGE] db dump/restore new zip based file format
authorAntony Lesuisse <al@openerp.com>
Wed, 12 Mar 2014 18:17:24 +0000 (19:17 +0100)
committerAntony Lesuisse <al@openerp.com>
Wed, 12 Mar 2014 18:17:24 +0000 (19:17 +0100)
bzr revid: al@openerp.com-20140312181724-hs26iumd4na2avns

1  2 
addons/web/controllers/main.py patch | diff1 | diff2 | blob | history

diff --cc addons/web/controllers/main.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.