Skip to content

S
syncEnrollments
Commit 163e5164 authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

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

Conflicts:
	gulpfile.js
parents fa978d05 b225276a
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
gulpfile.js
View file @ 163e5164
...@@ -12,7 +12,7 @@ var elixir = require('laravel-elixir'); ...@@ -12,7 +12,7 @@ var elixir = require('laravel-elixir');
*/ */
elixir(function(mix) { elixir(function(mix) {
mix.sass("app.scss") mix.sass('app.scss')
.publish( .publish(
'jquery/dist/jquery.min.js', 'jquery/dist/jquery.min.js',
'public/js/vendor/jquery.js' 'public/js/vendor/jquery.js'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment