Laurent Destailleur 4963555669 Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into ... marcosgdf-misc Conflicts: htdocs/barcode/codeinit.php		2015-02-18 22:54:02 +01:00
..
contact.class.php	Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into	2015-02-18 22:54:02 +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