Laurent Destailleur 9b7982bf0c Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/comm/propal.php htdocs/commande/card.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php htdocs/fourn/facture/card.php htdocs/theme/eldy/style.css.php		2015-06-08 18:28:50 +02:00
..
ckeditor	Include option FCKEDITOR_ENABLE_DETAILS_FULL to restore compatibility	2015-03-13 15:20:08 +01:00
img	NEW Can filter on contact status in prospect list. Removed deprecated	2015-06-05 10:49:02 +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	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-08-15 02:28:16 +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 remote-tracking branch 'origin/3.7' into develop	2015-06-08 18:28:50 +02:00
thumb.png	Optimized theme images	2014-08-19 12:39:25 +02:00