Laurent Destailleur 1fbf233f95 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/contact/list.php htdocs/contrat/list.php htdocs/expedition/list.php htdocs/expensereport/list.php htdocs/fichinter/list.php htdocs/fourn/commande/list.php htdocs/product/reassort.php htdocs/product/reassortlot.php htdocs/product/stock/list.php htdocs/societe/list.php htdocs/supplier_proposal/list.php htdocs/theme/eldy/style.css.php		2016-09-12 01:50:38 +02:00
..
ckeditor	Updated screenshots	2016-07-31 16:24:32 +02:00
img	Neutral colors	2016-08-03 20:52: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 '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2016-09-12 01:50:38 +02:00
thumb.png	Optimized theme images	2014-08-19 12:39:25 +02:00