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

Conflicts: gulpfile.js

Merge branch 'develop' of github.com:laravel/laravel into develop
Conflicts: gulpfile.js
163e5164 · Taylor Otwell · fa978d05 · b225276a · 163e5164
Commit 163e5164 authored Nov 24, 2014 by Taylor Otwell
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

gulpfile.js
+1 -1

No files found.
--- 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'