Manuel Raynaud 462b2bec5e Merge branch 'master' into frontend ...

Conflicts:
	templates/backOffice/default/folder-edit.html

2013-12-09 16:15:58 +01:00

..

lib/Thelia

Merge branch 'master' into frontend

2013-12-09 16:15:58 +01:00

bootstrap.php

Use getUriForPath() instead getSchemeAndHttpHost() for proper redirection for cases where Thelia is installed in a subdirectory

2013-11-26 18:08:45 +01:00