Laurent Destailleur 04934cc4aa Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/contrat/class/contrat.class.php htdocs/core/lib/functions.lib.php htdocs/projet/tasks/time.php		2018-02-27 19:18:43 +01:00
..
admin	Fix back link of look and feel v7	2018-02-26 09:20:05 +01:00
lib
tabs
agentMargins.php
checkMargins.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-01-24 11:49:36 +01:00
customerMargins.php
index.php
productMargins.php