diff options
| author | Olivier Dony <odo@openerp.com> | 2017-06-13 13:18:39 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2017-06-13 13:19:09 +0200 |
| commit | 70d522eb319285bae05b4542609ea702484d3384 (patch) | |
| tree | 67c35e0b7db8f1ab6a11c37f214012f2428d73c4 /addons/web/static/src/js/views/basic/basic_controller.js | |
| parent | 577eb10c0b74480c95571ada97d63a3741e16c4c (diff) | |
| parent | 21f93b80359c344c2df9332e4a50405e1c322964 (diff) | |
[MERGE] Forward-port saas-11 up to 21f93b80359c344c2df9332e4a50405e1c322964
Empty forward-port because commit 21f93b80359c344c2df9332e4a50405e1c322964
is only a backport that does not need to be forward-ported again.
The point of this fwd-port was to resolve the conflicts immediately.
Diffstat (limited to 'addons/web/static/src/js/views/basic/basic_controller.js')
0 files changed, 0 insertions, 0 deletions