diff options
| author | Xavier Morel <xmo@openerp.com> | 2014-04-02 11:42:43 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2014-04-02 11:42:43 +0200 |
| commit | d9b9894c62f3bed2b0e88a0bc495a3b4e7fe3ae3 (patch) | |
| tree | 786d83d96dddcef06e76d464d22724cd4dd0a37e /addons/web/static/src/js/data.js | |
| parent | 6a9379429cea71120c9422596c5dfa0a794e2acb (diff) | |
| parent | 4afeee59d10485b84740faf4182678a733f24b03 (diff) | |
[FIX] ged's fp-style merge
bzr revid: xmo@openerp.com-20140402094243-63p5lbcmx8h9ih3b
Diffstat (limited to 'addons/web/static/src/js/data.js')
0 files changed, 0 insertions, 0 deletions