Merge pull request #3839 from PascaleBeier/develop

[5.3] Make use of Bootstrap 3.3.7 with jQuery 3 support

Merge pull request #3839 from PascaleBeier/develop
[5.3] Make use of Bootstrap 3.3.7 with jQuery 3 support
9cce61be · Taylor Otwell · GitHub · 41e2efb0 · 0cfc40e7 · 9cce61be
Commit 9cce61be authored Jul 26, 2016 by Taylor Otwell Committed by GitHub Jul 26, 2016
Show whitespace changes
Inline Side-by-side

Showing with 15 additions and 15 deletions

package.json package.json +2 -2

app.css public/css/app.css +3 -3

app.js public/js/app.js +10 -10

No files found.
--- 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