diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-09-24 13:20:50 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-09-24 13:20:50 +0200 |
| commit | b1f327c9856216f297f906d76b24ee229535c0d9 (patch) | |
| tree | ab12a3d9021d32b132e1d80921aa793fc3600ad6 /addons/website/static/src/xml/website.editor.xml | |
| parent | 6a3939f9325f94284d56b54c62f4f362a4c8b08c (diff) | |
| parent | 7533fe77b44df28ccbe1708df6dbd36ce023ed48 (diff) | |
[MERGE] Merged with main website branch
bzr revid: tde@openerp.com-20130924112050-yzrhf7pm32ikzb31
Diffstat (limited to 'addons/website/static/src/xml/website.editor.xml')
0 files changed, 0 insertions, 0 deletions