Laurent Destailleur 770ddb6b0f Merge branch 'task-1793' of https://github.com/marcosgdf/dolibarr into ... marcosgdf-task-1793 Conflicts: ChangeLog htdocs/margin/lib/margins.lib.php		2015-01-31 14:29:15 +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
margins.lib.php	Merge branch 'task-1793' of https://github.com/marcosgdf/dolibarr into	2015-01-31 14:29:15 +01:00