diff options
| author | Olivier Dony <odo@openerp.com> | 2014-01-28 19:57:36 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2014-01-28 19:57:36 +0100 |
| commit | 52b811b7f9f4201cea8103413b3ce94c4d41156e (patch) | |
| tree | dad8e3724cf01e99fb9118779b3ce308bc6ba628 /addons/website/static/src/xml/website.xml | |
| parent | e54cb0291a5f342ca8ee24f4d93ee860b165fb1c (diff) | |
[FIX] Incomplete merge during previous trunk sync
bzr revid: odo@openerp.com-20140128185736-p5s5oujsju1mj88k
Diffstat (limited to 'addons/website/static/src/xml/website.xml')
0 files changed, 0 insertions, 0 deletions