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

Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	templates/admin/default/assets/css/admin.less
	templates/admin/default/currencies.html
	templates/admin/default/general_error.html
	templates/admin/default/messages.html
	templates/admin/default/variables.html

2013-09-04 17:40:34 +02:00

..

admin.less

Event harmonization with MRA

2013-09-04 15:45:46 +02:00