diff options
| author | Olivier Dony <odo@openerp.com> | 2015-06-10 13:04:42 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2015-06-10 13:04:42 +0200 |
| commit | 4703b8df9c072bd1a8d5bba57048341d27aad41e (patch) | |
| tree | ec8a3f08a66095d6026dea0313d5e78d7ce90c83 /addons/web/static/src/js/widgets | |
| parent | 0ce3853c8c117c2d6149a0304863132ff191f1db (diff) | |
| parent | 4bef17cc555af487b989dd470b0988c21db37a9a (diff) | |
[MERGE] From odoo/odoo#master - no-op because patches were applied on both sides
Just establishes a common ancestor for all descendants on both sides
Diffstat (limited to 'addons/web/static/src/js/widgets')
0 files changed, 0 insertions, 0 deletions