Merge remote-tracking branch 'origin/3.9' into 4.0

Browse Source

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

...

This commit is contained in:

Laurent Destailleur

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

parent c3bf1b2619 87c31d0761

commit d0380adc39

25 changed files with 5192 additions and 46 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

5

htdocs/includes/jquery/plugins/datatables/media/js/jquery.js vendored

File diff suppressed because one or more lines are too long