Merge https://github.com/laravel/laravel

2016-10-18 13:15:48 +05:00
parent e7a111c173 3437566d66
commit f55d7a9cb4
21 changed files with 39 additions and 29 deletions
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,6 +1,6 @@
 const elixir = require('laravel-elixir');

-require('laravel-elixir-vue');
+require('laravel-elixir-vue-2');

 /*
 |--------------------------------------------------------------------------