diff options
| author | tbe-odoo <tbe@odoo.com> | 2017-08-29 17:24:58 +0200 |
|---|---|---|
| committer | tbe-odoo <tbe@odoo.com> | 2017-08-29 17:24:58 +0200 |
| commit | 26eaac4ed16b2c8a572070bd9f3ee6dac858f4d2 (patch) | |
| tree | 8baecb371dbf39501d5cbd9825c09a7aa214449d /addons/web/static/src/js/views/basic/basic_view.js | |
| parent | be650c5979d6d427ad79bc23f0edc1d10290f881 (diff) | |
| parent | e81fa1d3fdf9853aed63a1e46a7ec7a4c7c82530 (diff) | |
[FIX] Conflicts while merging
Diffstat (limited to 'addons/web/static/src/js/views/basic/basic_view.js')
0 files changed, 0 insertions, 0 deletions