Franck Allimant ead038723f Merge branch 'master' of https://github.com/thelia/thelia ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Template.php

2013-11-06 11:16:27 +01:00

..

I18n

add translation files for thelia core system

2013-11-04 09:28:12 +01:00

Resources

Merge branch 'master' of https://github.com/thelia/thelia

2013-11-06 11:16:27 +01: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