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

This commit is contained in:
Taylor Otwell 2018-08-24 10:40:47 -05:00
parent dda50109be edc937c5e6
commit 53686dd018
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -15,7 +15,7 @@
"cross-env": "^5.1", "cross-env": "^5.1",
"jquery": "^3.2", "jquery": "^3.2",
"laravel-mix": "^2.0", "laravel-mix": "^2.0",
"lodash": "^4.17.4", "lodash": "^4.17.5",
"popper.js": "^1.12", "popper.js": "^1.12",
"vue": "^2.5.7" "vue": "^2.5.7"
} }

1
resources/views/welcome.blade.php
View File

@ -86,6 +86,7 @@
<a href="https://laravel.com/docs">Documentation</a> <a href="https://laravel.com/docs">Documentation</a>
<a href="https://laracasts.com">Laracasts</a> <a href="https://laracasts.com">Laracasts</a>
<a href="https://laravel-news.com">News</a> <a href="https://laravel-news.com">News</a>
<a href="https://nova.laravel.com">Nova</a>
<a href="https://forge.laravel.com">Forge</a> <a href="https://forge.laravel.com">Forge</a>
<a href="https://github.com/laravel/laravel">GitHub</a> <a href="https://github.com/laravel/laravel">GitHub</a>
</div> </div>