Christophe Matthieu 758aa20c75 [MERGE] from trunk ... bzr revid: chm@openerp.com-20140221112742-nq2g1l3emoa2q9cz		2014-02-21 12:27:42 +01:00
..
controllers	[MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr	2014-02-20 17:38:15 +01:00
data	[MERGE] from trunk	2014-02-21 10:43:43 +01:00
models	[MERGE] from trunk	2014-02-21 12:27:42 +01:00
security	[FIX] remove outdated & unnecessary security rules	2014-01-28 16:10:09 +01:00
static	[MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr	2014-02-20 17:38:15 +01:00
tests	[FIX] re-enable website_sale tests because they pass so whatever	2014-02-19 15:47:54 +01:00
views	[MERGE] from trunk	2014-02-21 12:27:42 +01:00
__init__.py	[FIX] website tests	2014-02-17 01:11:48 +01:00
__openerp__.py	[MERGE] from trunk	2014-02-21 10:43:43 +01:00