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

..

custom

Added some empty dirs

2011-12-07 18:10:57 +01:00

include

Merge branch '3.8'

2013-11-12 19:19:13 +01:00

scripts

Merge branch '3.8'

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

skins

Merge branch '3.8'

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

.htaccess

Revert apache htaccess

2013-05-24 16:27:23 +02:00

api.php

Fix #1563 : Explicitely declare the default environment to be Application::ENV_PROD

2013-11-05 10:53:32 +01:00

crossdomain.xml

V 3.5 RC 1

2011-12-05 00:23:28 +01:00

favicon.ico

initial import

2011-02-16 16:09:48 +01:00

index_dev.php

Fix #1563 : Explicitely declare the default environment to be Application::ENV_PROD

2013-11-05 10:53:32 +01:00

index.php

Fix #1563 : Explicitely declare the default environment to be Application::ENV_PROD

2013-11-05 10:53:32 +01:00