Laurent Destailleur 38233ca05d Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: htdocs/admin/limits.php htdocs/commande/class/commande.class.php htdocs/compta/facture.php htdocs/core/ajax/ziptown.php		2014-09-02 13:46:47 +02:00
..
ckeditor	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
img	Optimized theme images	2014-08-19 12:39:25 +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
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.6' into develop	2014-09-02 13:46:47 +02:00
thumb.png	Optimized theme images	2014-08-19 12:39:25 +02:00