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

@@ -8,7 +8,7 @@ use Illuminate\Contracts\Session\Session;
use Illuminate\Contracts\Config\Repository;
use Illuminate\Contracts\Routing\ResponseFactory;
use Tests\Unit\Http\Middleware\MiddlewareTestCase;
use Pterodactyl\Http\Middleware\AccessingValidServer;
use Pterodactyl\Http\Middleware\Server\AccessingValidServer;
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
class AccessingValidServerTest extends MiddlewareTestCase