Laurent Destailleur 9dd73de9b0 Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into marcosgdf-fr-2613 ... Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql		2015-04-18 20:47:20 +02:00
..
cabyprodserv.php	Invoices: added situation (or interim) invoices support	2015-01-06 17:12:13 +01:00
cabyuser.php	Invoices: added situation (or interim) invoices support	2015-01-06 17:12:13 +01:00
casoc.php	NEW: Feature request: A page to merge two thirdparties into one #2613	2015-04-18 20:41:09 +02:00
index.php	fix syntax errors	2015-04-18 18:07:41 +02:00