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

Conflicts:
	lib/classes/task/Scheduler.php
	templates/web/admin/user/demand.html.twig

2014-02-06 17:39:41 +01:00

..

custom

Added some empty dirs

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

include

Merge branch '3.8'

2014-02-04 11:25:59 +01:00

scripts

Merge branch '3.8'

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

skins

Merge branch '3.8'

2014-02-06 17:39:41 +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