Xavier Morel f4d78ae738 Merge branch 'server-trunk' ... Conflicts: addons/mass_mailing/controllers/main.py		2014-05-14 15:13:04 +02:00
..
controllers	[FIX] mass_mailing,website*,survey: leftover calls to website.get_public_user()	2014-05-12 12:39:35 +02:00
data	[FIX] website_forum: correct the 'Editor' goal definition, the field author_id on a mail_message is a m2o to res.partner and not res.users	2014-05-09 15:44:34 +02:00
models	[FIX] website_forum: more fixes :	2014-05-06 14:30:01 +02:00
security	[IMP] Sitemap	2014-05-11 15:40:37 +02:00
static	[MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1	2014-05-07 19:01:12 +02:00
views	[MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1	2014-05-07 19:01:12 +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