Laurent Destailleur 9d10eb57f2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: dev/dolibarr_changes.txt htdocs/compta/facture/card.php htdocs/compta/facture/list.php htdocs/main.inc.php		2017-12-20 13:28:41 +01:00
..
css	NEW Upgrade jquery to 3.3.1 and jquery-ui to 1.12	2017-02-23 00:46:19 +01:00
js	Add jquery-migrate to handle jquery 3.0 removes	2017-03-29 11:18:03 +02:00
plugins	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-20 13:28:41 +01:00