Etienne Roudeix 84204cbf05 Merge branch 'master' into template ...

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

2013-09-16 15:32:17 +02:00

..

cache

set execution right // no more troubles

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

config

default country

2013-09-16 15:30:46 +02:00

media

Merge branch 'master' into loops

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

modules

Merge branch 'master' into template

2013-09-16 15:32:17 +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