Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2015-02-06 13:40:06 -06:00
commit b2c296292c

View File

@ -36,14 +36,7 @@ class Handler extends ExceptionHandler {
*/
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);
}
}