summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/views/basic
diff options
context:
space:
mode:
authorJeremy Kersten <jke@odoo.com>2016-04-27 11:57:26 +0200
committerJeremy Kersten <jke@odoo.com>2016-04-27 12:13:54 +0200
commitbba692c5b675f2649d21dfad5f96b09fdb7ec59f (patch)
tree6bdbaaff6351c6a7332f4f71250cc6dbe15a92b4 /addons/web/static/src/js/views/basic
parentb67ee80a6c4b8366bb3fb3696725b21a9a3d8725 (diff)
parent2b56d22f225b6fcac8c132188cf88f77ab40bab1 (diff)
[MERGE] forward port of branch saas-9 up to 93aea2c6526e3ad7d27686eaca9ffbe2e6d30e19
Conflicts: project_timesheet_synchro/project_timesheet.py sale_contract/views/sale_contract_view.xml
Diffstat (limited to 'addons/web/static/src/js/views/basic')
0 files changed, 0 insertions, 0 deletions