Nicolas Le Goff b9bb9f5f0e Merge branch '3.8' ...

Conflicts:
	.gitignore
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/databox.php
	lib/classes/task/abstract.php
	lib/classes/task/manager.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/writemeta.php
	lib/conf.d/bases_structure.xml
	templates/web/admin/tasks/list.html.twig

2014-08-26 13:38:01 +02:00

..

custom

Added some empty dirs

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

include

Merge branch '3.8' into fix-latest-merge

2014-07-11 17:19:39 +02:00

scripts

Fix JS tests

2014-06-24 01:32:25 +02:00

skins

Merge branch '3.8' into fix-latest-merge

2014-08-11 20:28:03 +02: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

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