Manuel Raynaud 3f405d1ce9 Merge branch 'master' of github.com:thelia/thelia ...

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

2013-09-04 17:57:41 +02:00

..

admin/default

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

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

default

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

2013-09-04 17:57:41 +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