Cecile Tonglet 15fe515601 [MERGE] From trunk ... bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28		2012-12-17 15:43:06 +01:00
..
i18n	Launchpad automatic translations update.	2012-12-14 05:49:02 +00:00
security	[IMP] groups: remove auto-inclusion of admin in groups, and make the inclusion explicit in groups	2012-04-04 11:08:30 +02:00
__init__.py	[MERGE] trunk-v62_marketing_config-jap (config wizard for marketing)	2012-04-20 10:25:59 +02:00
__openerp__.py	[IMP] emoving bad code, no invitation system on events	2012-09-26 14:16:27 +02: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	[IMP] Re-set the sequence number for main menus	2012-11-21 17:27:53 +01:00
res_config.py	[IMP] use the openerp namespace.	2012-12-06 15:56:32 +01:00
res_config_view.xml	[MERGE] merged trunk.	2012-08-13 18:06:57 +02:00