[MERGE] forward port of branch 8.0 up to 5ed0739
authorJeremy Kersten <jke@odoo.com>
Tue, 18 Nov 2014 09:40:59 +0000 (10:40 +0100)
committerJeremy Kersten <jke@odoo.com>
Tue, 18 Nov 2014 09:40:59 +0000 (10:40 +0100)
commit86c634965e9204a6c296814bdbdd855b5842b913
tree1fb77d9dc5efc9ba77ba5ad3f31247d1f298e0aa
parentb1bd607e71b9416cd733d1451dc53cd355e5af9f
parent5ed0739e7368d6525ee5e7b22cd8fa621cb0ae20
[MERGE] forward port of branch 8.0 up to 5ed0739
addons/website_forum/controllers/main.py
addons/website_forum/data/forum_data.xml
addons/website_forum/models/forum.py
addons/website_forum/static/src/js/website.tour.forum.js
addons/website_forum/static/src/js/website_forum.js
addons/website_forum/views/website_forum.xml
doc/conf.py