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
..
Classes	Merge remote-tracking branch 'origin/3.9' into 4.0	2016-07-16 19:54:57 +02:00
.gitattributes
.gitignore
.travis.yml
changelog.txt
composer.json
install.txt
license.md