Manuel Raynaud 365d90b4a8 Merge branch 'master' into template ...

Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php

2013-09-16 10:19:40 +02:00

..

cache

set execution right // no more troubles

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

config

Merge branch 'master' into template

2013-09-16 10:19:40 +02:00

media

Merge branch 'master' into loops

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

modules

Merge branch 'master' into template

2013-09-11 15:28:38 +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