Laurent Destailleur 4a60d57544 Merge remote-tracking branch 'origin/3.6' into develop ...

Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/product/fiche.php
	htdocs/product/liste.php

2014-10-18 21:08:09 +02:00

..

index.php

Merge remote-tracking branch 'origin/3.6' into develop

2014-10-18 21:08:09 +02:00