Merge branch 'develop' into pr/1128

This commit is contained in:
Dane Everitt 2018-09-03 15:10:23 -07:00
commit 4d62e4c7b9
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
96 changed files with 1966 additions and 874 deletions

View file

@ -1,6 +1,6 @@
<?php
namespace Pterodactyl\Http\Middleware;
namespace Pterodactyl\Http\Middleware\Server;
use Closure;
use Illuminate\Http\Request;