Pull in the latest updates from upstream laravel master branch

This commit is contained in:
Kevin MacMartin 2016-08-23 22:46:13 -04:00
parent 6c6556233d
commit 780114ba60
4 changed files with 5 additions and 4 deletions

View file

@ -1 +1 @@
e959c228400341d4f2f8812606a0b16d740a2f2d f5dfa2057e800e15ecc1f5609016dfbc08fc643e

View file

@ -18,6 +18,7 @@ class Handler extends ExceptionHandler
\Illuminate\Auth\Access\AuthorizationException::class, \Illuminate\Auth\Access\AuthorizationException::class,
\Symfony\Component\HttpKernel\Exception\HttpException::class, \Symfony\Component\HttpKernel\Exception\HttpException::class,
\Illuminate\Database\Eloquent\ModelNotFoundException::class, \Illuminate\Database\Eloquent\ModelNotFoundException::class,
\Illuminate\Session\TokenMismatchException::class,
\Illuminate\Validation\ValidationException::class, \Illuminate\Validation\ValidationException::class,
]; ];

View file

@ -52,7 +52,5 @@
}, },
"config": { "config": {
"preferred-install": "dist" "preferred-install": "dist"
}, }
"minimum-stability": "dev",
"prefer-stable": true
} }

View file

@ -167,6 +167,8 @@ return [
* Package Service Providers... * Package Service Providers...
*/ */
//
/* /*
* Application Service Providers... * Application Service Providers...
*/ */