diff options
| author | Christophe Matthieu <chm@odoo.com> | 2014-06-24 08:17:12 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@odoo.com> | 2014-06-24 08:17:12 +0200 |
| commit | 518feee650e25c8f67808131863c072e3a54cbd6 (patch) | |
| tree | 079878e6cd2380d4c592e5ea9ae0ffbd15df33d1 /addons/website/static/src/xml/website.contentMenu.xml | |
| parent | e75d9525bb469faca1f6bf1255086d74f8a85862 (diff) | |
[FIX] merge error
Diffstat (limited to 'addons/website/static/src/xml/website.contentMenu.xml')
0 files changed, 0 insertions, 0 deletions