diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-09-02 14:51:57 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-09-02 14:53:23 +0200 |
| commit | cb1ae535f6bc2c131f662b392bcd13c3714118aa (patch) | |
| tree | 5fb5839455f6d08f29393160ed99125b1c97e28d /addons/web/static/src/js/framework/data.js | |
| parent | 33167a1eb5675d2aab3709be31b65d03d2fbfc29 (diff) | |
| parent | ddcd2e771b8b86f54410f2673ddd4f4b96031aa5 (diff) | |
[MERGE] forward port branch saas-6 up to ddcd2e7
Empty merge as 7bdd4de8051afa11e3941f7ab930c96b2e82bbc7 has already
been forward-ported with 33167a1eb5675d2aab3709be31b65d03d2fbfc29.
Diffstat (limited to 'addons/web/static/src/js/framework/data.js')
0 files changed, 0 insertions, 0 deletions