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

Merge pull request #4832 from daniel-banciulea/master 

[5.7] Fix running mix tasks error
This commit is contained in:
Taylor Otwell 2018-10-25 04:00:32 +11:00 committed by GitHub
parent 4c63c84073 4202ec978d
commit f9cf7ff1c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/js/bootstrap.js vendored
View File

@ -1,6 +1,5 @@
window._ = require('lodash'); window._ = require('lodash');
window.Popper = require('popper.js').default;
/** /**
* We'll load jQuery and the Bootstrap jQuery plugin which provides support * We'll load jQuery and the Bootstrap jQuery plugin which provides support
@ -9,6 +8,7 @@ window.Popper = require('popper.js').default;
*/ */
try { try {
window.Popper = require('popper.js').default;
window.$ = window.jQuery = require('jquery'); window.$ = window.jQuery = require('jquery');
require('bootstrap'); require('bootstrap');