Laurent Destailleur fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/sociales/charges.php htdocs/core/boxes/modules_boxes.php htdocs/core/class/commonobject.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php		2016-08-28 02:40:20 +02:00
..
canvas	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
class	NEW Show photo of contacts on thirdparty card.	2016-08-06 00:04:24 +02:00
card.php	Uniformize presentation on contact	2016-08-10 15:01:43 +02:00
document.php	FIX The include file for action on files should not be a template file	2016-04-02 14:16:16 +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	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	FIX Clear of filter should also reset categories and extrafields filter	2016-07-13 12:03:30 +02:00
note.php	Use the new banner on all tabs of contacts	2015-10-15 14:13:31 +02:00
perso.php	Uniformize presentation on contact	2016-08-10 15:01:43 +02:00
vcard.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-08-13 04:03:23 +02:00