Laurent Destailleur 9d10eb57f2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: dev/dolibarr_changes.txt htdocs/compta/facture/card.php htdocs/compta/facture/list.php htdocs/main.inc.php		2017-12-20 13:28:41 +01:00
..
ckeditor	Fix regression	2017-12-12 10:13:48 +01:00
img	Fix class not found	2017-11-25 16:52:04 +01: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	Ajout du theme "eldy".	2004-02-21 17:04:52 +00:00
graph-color.php	Fix bookmark jump	2017-05-06 21:39:00 +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 '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-20 13:28:41 +01:00
thumb.png	Optimized theme images	2014-08-19 12:39:25 +02:00