Romain Neutron 48680fd3c3 Merge branch '3.8' ...

Conflicts:
	CHANGELOG.md
	lib/Alchemy/Phrasea/Command/Developer/ComposerInstall.php
	lib/Alchemy/Phrasea/Core/Version.php
	templates/web/setup/wrapper.html.twig

2013-09-26 12:51:21 +02:00

..

index.html.twig

Addressed github review

2013-05-13 15:35:56 +02:00

step2.html.twig

Revert tests in html setup

2013-05-23 16:14:53 +02:00

upgrade-instructions.html.twig

Remove infinite redirection, add upgrade instructions

2013-09-17 16:28:23 +02:00

wrapper.html.twig

Merge branch '3.8'

2013-09-26 12:51:21 +02:00