Merge branch 'develop' of github.com:laravel/laravel into develop

Conflicts: gulpfile.js
2014-11-24 11:44:03 -06:00 · 2014-11-24 11:44:03 -06:00 · 163e51640e
parent fa978d0525 b225276a7a
commit 163e51640e
1 changed files with 1 additions and 1 deletions
--- a/gulpfile.js
+++ b/gulpfile.js
@ -12,7 +12,7 @@ var elixir = require('laravel-elixir');
 */

 elixir(function(mix) {
-    mix.sass("app.scss")
+    mix.sass('app.scss')
       .publish(
            'jquery/dist/jquery.min.js',
            'public/js/vendor/jquery.js'