Richard Mathot (OpenERP) 73da643cd3 [MERGE] Correct merge of parents ... bzr revid: rim@openerp.com-20140120092525-k4k8rxvh304tvy0i		2014-01-20 10:25:25 +01:00
..
controllers	[MERGE] Correct merge of parents	2014-01-20 10:25:25 +01:00
data	[IMP] better images for library	2014-01-17 09:28:13 +01:00
models	[MERGE] Correct merge of parents	2014-01-20 10:25:25 +01:00
security	[FIX] website: access for portal user	2014-01-17 16:46:48 +01:00
static	[MERGE] Correct merge of parents	2014-01-20 10:25:25 +01:00
tests	[FIX] Fixing merge problems	2014-01-20 10:23:42 +01:00
views	[FIX] Fixing merge problems	2014-01-20 10:23:42 +01:00
__init__.py	…
__openerp__.py	…
utils.py	…