Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Conflicts:
	gulpfile.js
This commit is contained in:
Taylor Otwell 2014-11-24 11:44:03 -06:00
parent fa978d0525 b225276a7a
commit 163e51640e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gulpfile.js
View File

@ -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'