Laurent Destailleur 7f8cbc0f62 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/adherents/type.php htdocs/contrat/services.php htdocs/contrat/tpl/linkedobjectblock.tpl.php htdocs/install/upgrade2.php		2018-02-14 22:08:18 +01:00
..
admin	Fix translation of extrafields type	2017-10-24 18:05:43 +02:00
class	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-02-14 22:08:18 +01:00
stats	FIX : test for filter fk_status	2017-11-29 11:06:33 +01:00
tpl	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-21 14:35:33 +01:00
card.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-02-08 12:58:47 +01:00
contact.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-28 09:56:40 +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
fiche-rec.php	Fix css	2018-02-05 12:34:11 +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
info.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-28 09:56:40 +01:00
invoicetemplate_list.php	factorization of extrafeild into list	2017-11-27 15:24:29 +01:00
list.php	FIX #8174	2018-02-12 14:02:51 +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
prelevement.php	Fix suggested amount for direct debit order	2018-01-18 18:22:10 +01:00