Thibault Delavallée 5ea15d56fb [MERGE] Sync with trunk ... bzr revid: tde@openerp.com-20140414090428-y435e4tsy4ju5nc3		2014-04-14 11:04:28 +02:00
..
i18n	Launchpad automatic translations update.	2014-04-12 08:31:53 +00:00
security	[REF] [ADD] marketing: marketing config + CRM-related stuff module reordering	2014-03-13 13:05:03 +01:00
__init__.py	[REF] [ADD] marketing: marketing config + CRM-related stuff module reordering	2014-03-13 13:05:03 +01:00
__openerp__.py	[REF] [ADD] marketing: marketing config + CRM-related stuff module reordering	2014-03-13 13:05:03 +01:00
marketing_demo.xml	[IMP]: Moved reference of demo user from *_security.xml to demo file	2010-11-19 15:55:25 +05:30
marketing_view.xml	[ADD] mass_mailing: added base for mass mailing analysis. Currently void analysis.	2014-03-28 11:26:01 +01:00
res_config.py	[REF] [ADD] marketing: marketing config + CRM-related stuff module reordering	2014-03-13 13:05:03 +01:00
res_config_view.xml	[REF] [ADD] marketing: marketing config + CRM-related stuff module reordering	2014-03-13 13:05:03 +01:00