Laurent Destailleur 9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contrat/list.php htdocs/expedition/class/expedition.class.php htdocs/fourn/card.php htdocs/product/stock/class/productlot.class.php htdocs/theme/eldy/style.css.php		2016-09-12 02:05:38 +02:00
..
ckeditor	Merge remote-tracking branch 'origin/4.0' into develop	2016-08-01 15:15:32 +02:00
img	NEW Add a better icon to show when play in cron jobs is disabled.	2016-09-10 19:48:50 +02:00
tpl	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
.gitignore	Prepare freeze	2014-11-07 21:52:50 +01:00
AUTHOR
graph-color.php	Better contrat on image colors	2015-07-14 12:24:24 +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
style.css.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-09-12 02:05:38 +02:00
thumb.png	Optimized theme images	2014-08-19 12:39:25 +02:00