Merge branch 'develop' into feature/vuejs

This commit is contained in:
Dane Everitt
2018-12-16 14:20:35 -08:00
54 changed files with 407 additions and 243 deletions

View File

@@ -1,6 +1,6 @@
<?php
namespace Pterodactyl\Http\Controllers\Api\Application\Locations;
namespace Pterodactyl\Http\Requests\Api\Application\Locations;
use Pterodactyl\Models\Location;
use Pterodactyl\Services\Acl\Api\AdminAcl;

View File

@@ -3,7 +3,6 @@
namespace Pterodactyl\Http\Requests\Api\Application\Locations;
use Pterodactyl\Models\Location;
use Pterodactyl\Http\Controllers\Api\Application\Locations\StoreLocationRequest;
class UpdateLocationRequest extends StoreLocationRequest
{