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

Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	templates/admin/default/admin-layout.tpl

2013-09-12 13:04:12 +02:00

..

admin/default

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

2013-09-12 13:04:12 +02:00

default

finishing creating lost password template

2013-09-11 17:22:23 +02:00

default_save

fix template

2013-09-11 20:22:29 +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