Romain Neutron ecf516406a Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Setup/Version/Migration/Migration38.php
	tests/classes/PhraseanetPHPUnitAbstract.php
	tests/classes/unitTestsTest.php

2013-12-19 10:31:52 +01:00

..

Migration

Merge branch '3.8'

2013-12-19 10:31:52 +01:00

Probe

Fix migration detection

2013-06-18 15:38:40 +02:00

MailChecker.php

Use short array declaration

2013-11-18 13:57:33 +01:00