Laurent Destailleur 82921232f5 Merge remote-tracking branch 'origin/3.6' into develop ...

Conflicts:
	htdocs/holiday/class/holiday.class.php

2014-08-06 09:27:01 +02:00

..

holiday.class.php

Merge remote-tracking branch 'origin/3.6' into develop

2014-08-06 09:27:01 +02:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00