Romain Neutron 09c74afab6 Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Export.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Helper/Prod.php
	lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
	lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
	lib/classes/User/Adapter.php
	lib/classes/caption/Field/Value.php
	lib/classes/collection.php
	lib/classes/module/report/filter.php
	lib/classes/task/period/ftp.php
	templates/web/common/dialog_export.html.twig
	templates/web/report/ajax_dashboard_content_child.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php

2013-12-18 12:12:58 +01:00

..

Adapter.php

Merge branch '3.8'

2013-12-18 12:12:58 +01:00

Interface.php

Remove license comments

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

Query.php

Merge branch '3.8'

2013-12-18 12:12:58 +01:00

QueryInterface.php

Remove license comments

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