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

Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml

2013-09-06 17:48:12 +02:00

..

admin/default

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

2013-09-06 17:48:12 +02:00

default

substitutions : product category folder content

2013-09-06 12:21:36 +02:00

install

initialize step 2

2013-09-02 19:56:34 +02:00

.gitkeep

set execution right // no more troubles

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