Merge branch 'develop' into feature/api-v1

This commit is contained in:
Dane Everitt 2017-12-31 10:32:28 -06:00
commit 46d7ba7585
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
32 changed files with 247 additions and 201 deletions

View file

@ -173,7 +173,6 @@ return [
/*
* Application Service Providers...
*/
Pterodactyl\Providers\SettingsServiceProvider::class,
Pterodactyl\Providers\AppServiceProvider::class,
Pterodactyl\Providers\AuthServiceProvider::class,
Pterodactyl\Providers\EventServiceProvider::class,