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
class	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-25 15:01:19 +01:00
tpl	FIX security vulnerability reported by ADLab of Venustech	2017-12-21 13:32:16 +01:00
card.php	Fix oldcopy must be saved before update_extras	2018-02-23 16:11:00 +01:00
document.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-28 09:56:40 +01:00
index.php	Replace deprecated dol_print_graph with DolGraph	2017-11-23 20:24:05 +01:00
info.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-28 09:56:40 +01:00
list.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-25 15:01:19 +01:00
note.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-28 09:56:40 +01:00