touffies 297d906027 Merge branch 'master' into frontend ...

Conflicts:
	core/lib/Thelia/Controller/Admin/OrderController.php

2013-11-12 11:09:55 +01:00

..

I18n

Fixed minor internationalizable string error in admin templates.

2013-11-06 20:01:26 +01:00

Resources

Merge branch 'master' into frontend

2013-11-12 11:09:55 +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