reset.blade.php
1.56 KB
-
Merge branch 'develop' of github.com:laravel/laravel into develop · 7a5bf6f5
Conflicts: public/css/app.css resources/assets/sass/app.scss resources/assets/sass/pages/_welcome.scss resources/views/layouts/app.blade.php resources/views/welcome.blade.php
Taylor Otwell committed