diff options
| author | Olivier Dony <odo@openerp.com> | 2016-04-02 01:09:07 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2016-04-02 01:09:07 +0200 |
| commit | b5a7491b64057b0300617f23345868535d5e997a (patch) | |
| tree | d15d1aeff0083911108fe7b6d9beff7bfa36ec0a /addons/web/static/src/xml/base.xml | |
| parent | f4d1adc116f226e5ccdbda114248848d4eb9ebfc (diff) | |
| parent | 83a08c47916e5535a39df47f2cab8c4bc3acf810 (diff) | |
[MERGE] Forward-port of saas-7 up to rev. 83a08c47916e5535a39df47f2cab8c4bc3acf810
Conflicts:
openerp/addons/base/res/res_partner.py
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
0 files changed, 0 insertions, 0 deletions