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
..
canvas	Fix css and look 5.0	2017-01-22 12:13:32 +01:00
class	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-02-23 02:54:40 +01:00
agenda.php	Fix bad side effect of uniformizing a constant name.	2017-02-01 15:47:08 +01:00
card.php	Fix cancel button + logic to close project when setting opp to WON/LOST.	2017-02-01 13:25:16 +01:00
document.php	Complete work on dol_banner	2016-12-19 16:35:40 +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	The new banner tab is also on user card now	2015-10-11 15:21:21 +02:00
ldap.php	Fix ambiguous test on ldap return of getAttributes	2016-05-29 11:20:12 +02:00
list.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-04-11 11:43:54 +02:00
note.php	Complete work on dol_banner	2016-12-19 16:35:40 +01:00
perso.php	Complete work on dol_banner	2016-12-19 16:35:40 +01:00
vcard.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-08-13 04:03:23 +02:00