Nicolas Le Goff 6ba5ce6669 Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/Root.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php
	lib/classes/task/Scheduler.php
	lib/classes/task/abstract.php
	lib/classes/task/databoxAbstract.php
	templates/web/admin/collection/collection.html.twig
	templates/web/admin/databox/databox.html.twig
	templates/web/email-template.html.twig

2014-01-24 18:52:14 +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'

2014-01-06 15:38:14 +01:00

skins

Merge branch '3.8'

2014-01-24 18:52:14 +01:00

.htaccess

Revert apache htaccess

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

api.php

Bump copyright year

2014-01-06 15:28:12 +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

Bump copyright year

2014-01-06 15:28:12 +01:00

index.php

Bump copyright year

2014-01-06 15:28:12 +01:00