diff options
| author | Jeremy Kersten <jke@odoo.com> | 2016-04-27 11:45:43 +0200 |
|---|---|---|
| committer | Jeremy Kersten <jke@odoo.com> | 2016-04-27 11:45:43 +0200 |
| commit | 2b56d22f225b6fcac8c132188cf88f77ab40bab1 (patch) | |
| tree | 92f2536433b6e70fc2113d681710f90bf6ee8e68 /addons/web/static/src/js/views/basic/basic_controller.js | |
| parent | a0eea9a1a655f56f9735e09045e4a62b5a19dc4b (diff) | |
| parent | de74cd19de87370cf3a9ac04c0499ba65b4d74b6 (diff) | |
[MERGE] forward port of branch 9.0 up to 0dc0d6b7e51537507f80be988c25fdabeafe68f7
Conflicts:
website_crm_score/models/sales_team.py
Diffstat (limited to 'addons/web/static/src/js/views/basic/basic_controller.js')
0 files changed, 0 insertions, 0 deletions