diff options
| author | Gery Debongnie <ged@openerp.com> | 2014-04-10 15:32:51 +0200 |
|---|---|---|
| committer | Gery Debongnie <ged@openerp.com> | 2014-04-10 15:32:51 +0200 |
| commit | c6f41caf994a4860098356edf13f16bc3b87e619 (patch) | |
| tree | 9b4979a56baf855e250b64d667b8bc391d934bda /addons/website/static/src/xml/website.editor.xml | |
| parent | 2df67ad6c943803140abef760a492fdf0e68d44d (diff) | |
| parent | d67e63150e5f6652b457201e7933164719f2c03f (diff) | |
[MERGE] merge from trunk
bzr revid: ged@openerp.com-20140409120604-tgc4o9zkkr69sf4q
bzr revid: ged@openerp.com-20140409150557-1wsyuvpw1ly75fhn
bzr revid: ged@openerp.com-20140410133251-k200ui19hjs6jnur
Diffstat (limited to 'addons/website/static/src/xml/website.editor.xml')
0 files changed, 0 insertions, 0 deletions