Merge remote-tracking branch 'origin/dev-nouislider' into dev

# Conflicts:
#	js/tabler.js
This commit is contained in:
codecalm
2020-01-27 15:57:59 +01:00
15 changed files with 568 additions and 4 deletions
+4 -2
View File
@@ -26,7 +26,8 @@
"daterangepicker/moment.min.js",
"daterangepicker/daterangepicker.js"
],
"countup": "countup.js/dist/countUp.min.js"
"countup": "countup.js/dist/countUp.min.js",
"nouislider": "nouislider/distribute/nouislider.min.js"
},
"css": {
"jqvmap": "jqvmap/dist/jqvmap.min.css",
@@ -37,6 +38,7 @@
"@fullcalendar/timegrid/main.min.css",
"@fullcalendar/list/main.min.css"
],
"daterangepicker": "daterangepicker/daterangepicker.css"
"daterangepicker": "daterangepicker/daterangepicker.css",
"nouislider": "nouislider/distribute/nouislider.min.css"
}
}