Laurent Destailleur d0380adc39 Merge remote-tracking branch 'origin/3.9' into 4.0 ...

Conflicts:
	htdocs/filefunc.inc.php
	htdocs/includes/jquery/plugins/datatables/media/js/jquery.js
	htdocs/product/list.php

2016-07-16 19:54:57 +02:00

..

phpexcel

CRLF

2016-07-15 17:22:27 +02:00