Laurent Destailleur e4617ec76c Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/core/filemanagerdol/connectors/php/config.php htdocs/viewimage.php		2016-11-11 15:03:05 +01:00
..
php	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2016-11-11 15:03:05 +01: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