Laurent Destailleur ef3d86333c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/projet/activity/perday.php		2017-10-06 12:38:50 +02:00
..
card.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-06 12:38:50 +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
info.php	Fix require_once instead of require.	2016-11-24 17:03:18 +01:00