Fabien Pinckaers 143615ddc1 Merge branch 'master-remove-html-fields-backend-ypa' of https://github.com/odoo-dev/odoo into odoo-dev-master-remove-html-fields-backend-ypa		2014-05-23 09:24:16 +02:00
..
controllers	[MERGE] forward port of branch saas-4 up to revid bb26dea	2014-05-20 20:19:55 +02:00
data	[IMP] website_forum: make forum;forum inherit from mail.thread. This way we	2014-05-22 13:49:41 +02:00
models	[IMP] website_forum: make forum;forum inherit from mail.thread. This way we	2014-05-22 13:49:41 +02:00
security	[MERGE] sitemap backport, merge trunk from 9438 til 9440	2014-05-13 16:38:31 +02:00
static	[MERGE] forward port of branch saas-4 up to revid bb26dea	2014-05-20 20:19:55 +02:00
views	Merge branch 'master-remove-html-fields-backend-ypa' of https://github.com/odoo-dev/odoo into odoo-dev-master-remove-html-fields-backend-ypa	2014-05-23 09:24:16 +02:00
__init__.py	[CLEAN] website_forum: removed some licences, only one is sufficient	2014-04-11 16:50:18 +02:00
__openerp__.py	[MERGE] upstream	2014-04-29 17:41:04 +02:00