Merge pull request #3839 from PascaleBeier/develop

[5.3] Make use of Bootstrap 3.3.7 with jQuery 3 support
2016-07-26 15:37:39 -04:00 · 2016-07-26 15:37:39 -04:00 · 9cce61be27
parent 41e2efb0ad 0cfc40e790
commit 9cce61be27
3 changed files with 15 additions and 15 deletions
--- a/package.json
+++ b/package.json
@ -5,9 +5,9 @@
    "dev": "gulp watch"
  },
  "devDependencies": {
-    "bootstrap-sass": "3.3.6",
+    "bootstrap-sass": "^3.3.7",
    "gulp": "^3.9.1",
-    "jquery": "^2.2.4",
+    "jquery": "^3.1.0",
    "js-cookie": "^2.1.2",
    "laravel-elixir": "^6.0.0-9",
    "laravel-elixir-vue": "^0.1.4",
--- a/public/css/app.css
+++ b/public/css/app.css
--- a/public/js/app.js
+++ b/public/js/app.js