Christophe Simonis 713b00d477 [MERGE] forward port of branch saas-1 up to revid 3740 chs@openerp.com-20130702141958-zxkppo4c6zvpo0uf ... bzr revid: chs@openerp.com-20130702145352-dym8zvfkwzb3qiqa		2013-07-02 16:53:52 +02:00
..
cli	[FIX] test_js typo	2012-12-09 05:30:15 +01:00
controllers	[MERGE] Forward-port of latest bugfixes from 7.0 up to rev 4007 (launchpad_translations_on_behalf_of_openerp-20130730045810-58du4wi80axs0t81)	2013-07-31 09:29:14 +02:00
doc	merge trunk	2013-06-21 15:52:07 +02:00
i18n	Launchpad automatic translations update.	2013-08-12 05:06:50 +00:00
static	[MERGE] forward port of branch saas-1 up to revid 3740 chs@openerp.com-20130702141958-zxkppo4c6zvpo0uf	2013-07-02 16:53:52 +02:00
tests	Put back stuff removed by merge	2013-06-07 12:37:49 +02:00
__init__.py	minor fixes	2012-12-19 03:49:46 +01:00
__openerp__.py	[FIX] __openerp__.py: added `base` as a dependency.	2013-06-18 11:58:16 +02:00
http.py	[FIX] monodb: correct behaviour in no-db-list mode (manual forward port of 7.0 rev 3991 mat@openerp.com-20130702122014-6l79a748lb946hkq)	2013-07-02 14:24:04 +02:00