Laurent Destailleur dc96e10215 Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into ... marcosgdf-oop-pdf Conflicts: htdocs/projet/class/project.class.php		2014-09-23 00:02:19 +02:00
..
card.php	Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into	2014-09-23 00:02:19 +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