Merge branch 'master' into develop

81aea745 · Taylor Otwell · b358fe47 · f8cddc00 · 81aea745
Commit 81aea745 authored May 04, 2016 by Taylor Otwell
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

package.json package.json +1 -1

No files found.
--- a/package.json
+++ b/package.json
@@ -7,6 +7,6 @@
  "devDependencies": {
    "gulp": "^3.9.1",
    "laravel-elixir": "^5.0.0",
-    "bootstrap-sass": "^3.0.0"
+    "bootstrap-sass": "^3.3.0"
  }
 }