diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-06-15 13:10:45 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-06-15 13:10:45 +0200 |
| commit | 9fe4cf5f728ffc3ad2bb387841aa1b57c1ba16dd (patch) | |
| tree | 8dc9257aba7132a65fa9ac02fd847db290d95d30 /addons/web/static/src/js/widgets/debug_manager.js | |
| parent | b2220945896bb9f343840d19b8d2821467e22d48 (diff) | |
| parent | dda0d3d62d23cae3013db32bcb6322a2574f0162 (diff) | |
[MERGE] forward port of branch saas-11 up to dda0d3d
# Conflicts:
# addons/product_uos/i18n/lo.po
# addons/sales_team/models/__init__.py
# addons/website_payment/views/website_payment_templates.xml
# addons/website_portal_sale/views/templates.xml
# openerp/addons/base/ir/ir_qweb.py
Diffstat (limited to 'addons/web/static/src/js/widgets/debug_manager.js')
0 files changed, 0 insertions, 0 deletions