Manuel Raynaud 805b38ab9a Merge branch 'master' into content ...

Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	templates/admin/default/folders.html

2013-09-20 17:41:38 +02:00

..

admin/default

Merge branch 'master' into content

2013-09-20 17:41:38 +02:00

default

re-add home link in menu

2013-09-20 16:56:23 +02:00

default_save

fix current url bug + fix empty loop pagination exception

2013-09-12 17:20:33 +02:00

.gitkeep

set execution right // no more troubles

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