Merge branch 'dev' into module_profiler

2017-09-23 00:45:51 +02:00
parent 7d6a3737e3 ced920505a
commit 680edb14c1
711 changed files with 14073 additions and 84301 deletions
@@ -4,14 +4,14 @@
  "devDependencies": {},
  "dependencies": {
    "animate.css": "~3.4.0",
-    "bootstrap": "v4.0.0-alpha.3",
+    "bootstrap": "v4.0.0-alpha.5",
    "font-awesome": "~4.5.0",
-    "jquery": "~2.1.4",
+    "jquery": "~3.2.1",
    "metisMenu": "~2.0.3",
    "nprogress": "~0.2.0",
    "responsive-bootstrap-toolkit": "~2.5.0",
    "Sortable": "~1.4.2",
-    "tether": "~1.1.1",
+    "tether": "~1.3.7",
    "tinycolor": "~1.2.1",
    "dropzone": "~4.2.0",
    "jquery.are-you-sure": "~1.9",