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
..
ckeditor	Merge remote-tracking branch 'origin/4.0' into develop	2016-08-01 15:15:32 +02:00
img	NEW Reduce nb of picto on ref into list, merging preview and download	2016-08-05 12:20:11 +02:00
tpl
.gitignore
AUTHOR
graph-color.php	Fixed md theme name	2015-12-04 18:04:41 +01:00
index.html
style.css.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-08-28 02:40:20 +02:00
thumb.png