Laurent Destailleur 69db960a92 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/projet/activity/perweek.php

2018-04-26 18:33:02 +02:00

..

holiday.class.php

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-04-26 18:33:02 +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