Laurent Destailleur 19ac160696 Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/compta/facture/impayees.php htdocs/compta/index.php htdocs/core/boxes/box_prospect.php htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z htdocs/includes/tcpdf/fonts/dejavusanscondensed.z htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z htdocs/includes/tcpdf/fonts/dejavusansextralight.z htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z htdocs/includes/tcpdf/fonts/dejavusansmono.z htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z htdocs/includes/tcpdf/fonts/dejavusansmonob.z htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z htdocs/includes/tcpdf/fonts/dejavusansmonobi.z htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z htdocs/includes/tcpdf/fonts/dejavusansmonoi.z		2015-09-03 10:49:41 +02:00
..
admin	Better translation	2015-07-16 13:28:40 +02:00
lib	Merge branch 'task-1793' of https://github.com/marcosgdf/dolibarr into	2015-01-31 14:29:15 +01:00
tabs	Fix PHPCS	2015-07-28 18:33:43 +02:00
agentMargins.php	[ task #1793 ] Create new permission to restrict commercial agent margin to logged user	2015-01-18 16:42:11 +01:00
customerMargins.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-09-03 10:44:40 +02:00
index.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2015-01-18 15:21:38 +01:00
productMargins.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-09-03 10:49:41 +02:00