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

..

common.js

Fix #3930 Removed executable bit

2015-12-09 13:28:36 +01:00

fckxml.js

Fix #3930 Removed executable bit

2015-12-09 13:28:36 +01: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