Merge branch 'dev' into dev-nouislider

This commit is contained in:
Dawid Harat
2020-01-14 20:41:25 +01:00
247 changed files with 47909 additions and 38215 deletions
+5
View File
@@ -23,6 +23,10 @@
"@fullcalendar/timegrid/main.min.js",
"@fullcalendar/list/main.min.js"
],
"daterangepicker": [
"daterangepicker/moment.min.js",
"daterangepicker/daterangepicker.js"
],
"countup": "countup.js/dist/countUp.min.js",
"nouislider": "nouislider/distribute/nouislider.min.js"
},
@@ -35,6 +39,7 @@
"@fullcalendar/timegrid/main.min.css",
"@fullcalendar/list/main.min.css"
],
"daterangepicker": "daterangepicker/daterangepicker.css",
"nouislider": "nouislider/distribute/nouislider.min.css"
}
}