diff options
| author | Christophe Simonis <chs@openerp.com> | 2014-04-03 10:48:08 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2014-04-03 10:48:08 +0200 |
| commit | 1c3ee251f0213b2fb83de99be8a50e630447e191 (patch) | |
| tree | 59b9202b6d4ffcb78c302fb95206fb43ec317dfc /addons/website/static/src/xml/website.editor.xml | |
| parent | 822ef4a6211b8dfebc1be25b290265a58833c1f8 (diff) | |
| parent | 6fca27626a16e2be953d9093713ec7ec8d662ab5 (diff) | |
[MERGE] forward port of branch 7.0 up to revid 5270 chs@openerp.com-20140403084524-9rb174osjrbmhgwc
bzr revid: chs@openerp.com-20140402083506-w4cywcf0kxxx9xmk
bzr revid: chs@openerp.com-20140312174526-a5rhh83g0fw8djuc
bzr revid: chs@openerp.com-20140318105837-53vsx5g7fm517cuc
bzr revid: dle@openerp.com-20140326092548-bu4bqinhvco8j5wj
bzr revid: chs@openerp.com-20140402092735-3a23yjl169vvt0iv
bzr revid: chs@openerp.com-20140402112825-ky8rcb3p467ikitc
bzr revid: chs@openerp.com-20140403084808-slnj7uis17kwi9js
Diffstat (limited to 'addons/website/static/src/xml/website.editor.xml')
0 files changed, 0 insertions, 0 deletions