Laurent Destailleur 4a88c9ea9f Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/product/class/product.class.php		2015-12-13 15:53:57 +01:00
..
ckeditor	Fix #3930 Removed executable bit	2015-12-09 13:28:36 +01:00
img	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-12-13 15:53:57 +01:00
tpl	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-12-13 15:53:57 +01:00
AUTHOR	Fix #3930 Removed executable bit	2015-12-09 13:28:36 +01:00
graph-color.php	Removed closing php tag	2014-05-03 18:18:44 +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	Use span class="badge" for notes.	2014-10-19 19:57:42 +02:00
thumb.png	Fix #3930 Removed executable bit	2015-12-09 13:28:36 +01:00