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

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

2013-09-04 16:05:25 +02:00

..

admin/default

Working : Cleanup admin new version bootstrap v3

2013-09-04 15:34:29 +02:00

default

global outputs in loops

2013-09-04 14:45:14 +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