Merge branch 'develop' into feature/updated-models

This commit is contained in:
Dane Everitt 2017-02-10 20:30:20 -05:00 committed by GitHub
commit a14df81f27
4 changed files with 64 additions and 0 deletions

View file

@ -17,7 +17,9 @@ class Kernel extends HttpKernel
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\Pterodactyl\Http\Middleware\LanguageMiddleware::class,
\Fideloper\Proxy\TrustProxies::class,
];
/**