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

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	templates/admin/default/configuration.html

2013-10-21 08:13:18 +02:00

..

config

new model

2013-10-21 08:10:55 +02:00

media

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

modules

don't use alternative Logger in debugbar if debug is disabled

2013-10-18 15:59:49 +02:00

session

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

.gitkeep

set execution right // no more troubles

2013-06-20 15:21:16 +02:00