Merge branch 'master' into develop

2016-12-29 13:03:32 +00:00
parent 077d404c5f b43890c11f
commit 36875bb98e
8 changed files with 35 additions and 19 deletions
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
    "bootstrap-sass": "^3.3.7",
    "gulp": "^3.9.1",
    "jquery": "^3.1.0",
-    "laravel-elixir": "^6.0.0-11",
+    "laravel-elixir": "^6.0.0-14",
    "laravel-elixir-vue-2": "^0.2.0",
    "laravel-elixir-webpack-official": "^1.0.2",
    "lodash": "^4.16.2",