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

…

fckxml.js

…

index.html

…