Merge branch 'develop' into pr/1128

This commit is contained in:
Dane Everitt
2018-09-03 15:10:23 -07:00
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;