Laurent Destailleur 2446cb5431 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/compta/facture.php htdocs/compta/facture/fiche-rec.php htdocs/contact/list.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/facture/card.php htdocs/societe/list.php htdocs/user/document.php		2017-04-11 11:43:54 +02:00
..
admin	[Qual] comments should be in english	2015-12-22 09:37:27 +01:00
class	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-02-02 02:24:57 +01:00
stats	NEW Can filter on status on objects on the "statistics" page.	2016-11-03 19:50:04 +01:00
tpl	Miscellaneous fixes	2016-11-12 12:40:06 +01:00
apercu.php	NEW Add type "url" as possible extrafield.	2016-11-08 17:21:26 +01:00
contact.php	Continue work on dol_banner	2016-12-11 13:16:21 +01:00
document.php	Continue work on dol_banner	2016-12-11 13:16:21 +01:00
fiche-rec.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-04-11 11:43:54 +02: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	Continue work on dol_banner	2016-12-11 13:16:21 +01:00
list.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-02-10 17:33:32 +01:00
note.php	Continue work on dol_banner	2016-12-11 13:16:21 +01:00
prelevement.php	Continue work on dol_banner	2016-12-11 13:16:21 +01:00