Colin Newell a5a21b8d18 Merge branch 'master' into testing_improvements		2016-03-10 10:07:54 +00:00
..
Dockerfile	Merge branch 'master' into testing_improvements	2016-03-10 10:07:54 +00:00
entrypoint.sh	Add support for gosu to allow for root access.	2015-07-30 16:16:39 +01:00
openerp-server.conf	[IMP] openerp-server.conf: custom addons take priority over odoo addons	2015-10-08 14:50:02 +02:00