Manuel Raynaud 6fef556319 Merge branch 'propel' ...

Conflicts:
	install/thelia.sql

2013-10-22 14:48:10 +02:00

..

Resources

create newsletter template

2013-10-22 10:49:30 +02:00

DatabaseConfiguration.php

fix usage of ProfilerConnectionWrapper

2013-09-30 15:35:46 +02:00

DefinePropel.php

hardcode utf8 parameters

2013-10-18 13:57:24 +02:00