Laurent Destailleur e981e719a1 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/comm/action/card.php		2017-02-23 02:54:40 +01:00
..
contact.class.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-02-23 02:54:40 +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