Florian HENRY 46f673fb5f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/contrat/class/contrat.class.php htdocs/fourn/card.php		2014-09-29 16:01:49 +02:00
..
contrat.class.php	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2014-09-29 16:01:49 +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