Laurent Destailleur 3adb43c6e5 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture.php htdocs/core/boxes/box_produits.php htdocs/core/boxes/box_produits_alerte_stock.php htdocs/langs/en_US/bills.lang htdocs/product/class/product.class.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php		2017-03-23 12:52:19 +01:00
..
ckeditor	NEW Can use native php and dolibarr object on pages of module website.	2016-09-16 01:13:52 +02:00
img	Update favorite icon to use standard icon.	2017-03-11 03:35:02 +01: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 '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-23 12:52:19 +01:00
thumb.png