diff options
| author | Fabien Meghazi <fme@openerp.com> | 2014-01-28 19:36:44 +0100 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2014-01-28 19:36:44 +0100 |
| commit | e54cb0291a5f342ca8ee24f4d93ee860b165fb1c (patch) | |
| tree | 97de607591bfb5230a1c81497dbd45ca9a99c11b /addons/website/static/src/xml/website.xml | |
| parent | 107f2ada55fb8d6ea8afdbbc4af6c0cf813c3bbb (diff) | |
[REM] conflict leftover
bzr revid: fme@openerp.com-20140128183644-8wxgd1nwjrbcgwjt
Diffstat (limited to 'addons/website/static/src/xml/website.xml')
0 files changed, 0 insertions, 0 deletions