Etienne Roudeix a647bfd016 Merge branch 'master' into tax ...

Conflicts:
	local/config/schema.xml

2013-09-27 13:35:39 +02:00

..

Resources

Merge branch 'master' into tax

2013-09-27 13:35:39 +02:00

DatabaseConfiguration.php

apply cs-fixer

2013-08-14 09:29:04 +02:00

DefinePropel.php

apply cs-fixer

2013-08-14 09:29:04 +02:00