Merge branch 'master' into develop

2016-05-04 09:30:19 -05:00 · 2016-05-04 09:30:19 -05:00 · 81aea74578
parent b358fe473d f8cddc0000
commit 81aea74578
1 changed files with 1 additions and 1 deletions
--- 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"
  }
 }