diff options
| author | Darshan Kalola (OpenERP) <dka@tinyerp.com> | 2014-02-10 14:18:03 +0530 |
|---|---|---|
| committer | Darshan Kalola (OpenERP) <dka@tinyerp.com> | 2014-02-10 14:18:03 +0530 |
| commit | b3c6e20e36cf58a2abce721cbb30c80d3f5f42f8 (patch) | |
| tree | 3dce72a08152a30da4a619ad3c7f385169255b4b /addons/web/static/src/xml/base.xml | |
| parent | 7a1e5b9b6951a3277af8e82535485c161f9f02c7 (diff) | |
| parent | d8c5a1c4c2a5f3a7f11c66fdbc624485e6485489 (diff) | |
[MERGE]sync with trunk and resolve conflicts.
bzr revid: dka@tinyerp.com-20140210084803-rjkt9e4rhni8nhlt
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
0 files changed, 0 insertions, 0 deletions