[MERGE] Sync with upstram: website-forum-tpa
authorThibault Delavallée <tde@openerp.com>
Wed, 9 Apr 2014 16:58:04 +0000 (18:58 +0200)
committerThibault Delavallée <tde@openerp.com>
Wed, 9 Apr 2014 16:58:04 +0000 (18:58 +0200)
commit1d5beb57eff04290652c39bf4c9ca931456bb8cd
treebfdf75d7edc1324491e94b81b1501fb37badca25
parent4d41e36a9193cb1c14b8cfcd32105f98bba04057
parent1cb83cbb3bb895c35d35f70fcc608a0fd61c2ee4
[MERGE] Sync with upstram: website-forum-tpa

bzr revid: tde@openerp.com-20140409165804-q4wi76e0m0c9ovzw
addons/website_forum/controllers/main.py
addons/website_forum/static/src/js/website_forum.editor.js
addons/website_forum/views/website_forum.xml