diff options
| author | Josse Colpaert <jco@openerp.com> | 2012-12-10 17:31:41 +0100 |
|---|---|---|
| committer | Josse Colpaert <jco@openerp.com> | 2012-12-10 17:31:41 +0100 |
| commit | ba58da4a593b599dc51e99400d9c6d4833496182 (patch) | |
| tree | 6cb4bd053d47436dbf78f84d1900ee3ae26dace3 /addons/web/static/src/js/data.js | |
| parent | 96d50a9a40d77680ffbd1719385e33757c89f725 (diff) | |
| parent | e14e1122ac4f1a7e9bd2e71ba239ec7a1196118b (diff) | |
[MERGE] Merge from trunk
bzr revid: jco@openerp.com-20121210150809-jsmm2r5jozkhg6uh
bzr revid: jco@openerp.com-20121210163141-h30a7h9s8tuz2uqz
Diffstat (limited to 'addons/web/static/src/js/data.js')
0 files changed, 0 insertions, 0 deletions