Xavier Morel a2b23a1ca7 [REM] merge conflict file committed ... bzr revid: xmo@openerp.com-20121129112350-egvxrg8ii71wzdx6		2012-11-29 12:23:50 +01:00
..
controllers	[MERGE] from trunk	2012-11-29 10:10:38 +01:00
doc	[MERGE] from trunk	2012-11-29 10:10:38 +01:00
i18n	Launchpad automatic translations update.	2012-11-29 05:21:58 +00:00
static	[REM] merge conflict file committed	2012-11-29 12:23:50 +01:00
tests	[REM] EVALPOCALYPSE PART 2: no more python-side eval	2012-11-26 15:05:25 +01:00
__init__.py	web remove common, fix imports	2012-10-10 22:37:53 +02:00
__openerp__.py	[MERGE] from trunk	2012-11-20 11:17:33 +01:00
http.py	[REM] EVALPOCALYPSE PART 2: no more python-side eval	2012-11-26 15:05:25 +01:00
session.py	[REM] EVALPOCALYPSE PART 2: no more python-side eval	2012-11-26 15:05:25 +01:00