Nicolas Le Goff 5e07b68780 Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Authentication/Phrasea/NativeAuthentication.php
	lib/Alchemy/Phrasea/Controller/Report/Root.php
	templates/web/report/ajax_dashboard_content_child.html.twig
	templates/web/report/all_content.html.twig
	templates/web/report/report_layout_child.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Report/RootTest.php

2014-03-23 19:49:12 +01:00

..

custom

Added some empty dirs

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

include

Remove dev dependencies from package tasks

2014-02-27 19:23:59 +01:00

scripts

Revert fetching tooltip dependency with bower

2014-03-05 15:33:23 +01:00

skins

Merge branch '3.8'

2014-03-23 19:49:12 +01:00

.htaccess

Revert apache htaccess

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

api.php

Add error reporting setting

2014-03-04 15:40:33 +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

Add error reporting setting

2014-03-04 15:40:33 +01:00

index.php

Add error reporting setting

2014-03-04 15:40:33 +01:00