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

..

event

Remove license comments

2013-11-20 16:49:29 +01:00

notify

Merge branch '3.8'

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

broker.php

Use symfony translator

2013-12-03 20:02:40 +01:00

eventAbstract.php

Add missing headers

2013-11-20 19:03:55 +01:00

notifyAbstract.php

Add missing headers

2013-11-20 19:03:55 +01:00