Commit b2c29629 authored by Taylor Otwell's avatar Taylor Otwell

Merge branch 'master' into develop

parents 9da5d30b 35acc540
...@@ -35,15 +35,8 @@ class Handler extends ExceptionHandler { ...@@ -35,15 +35,8 @@ class Handler extends ExceptionHandler {
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function render($request, Exception $e) public function render($request, Exception $e)
{
if ($this->isHttpException($e))
{
return $this->renderHttpException($e);
}
else
{ {
return parent::render($request, $e); return parent::render($request, $e);
} }
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment