StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into fix/trusted-proxies

Browse source
This commit is contained in:
Jakob 2017-02-03 00:38:58 +01:00 • committed by GitHub
commit 19567ee311
24 changed files with 5449 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/app.php
View file

@ -6,6 +6,8 @@ return [
'version' => env('APP_VERSION', 'canary'),
'phrase_in_context' => env('PHRASE_IN_CONTEXT', false),
/*
|--------------------------------------------------------------------------
| Application Debug Mode
@ -137,7 +139,6 @@ return [
Illuminate\Redis\RedisServiceProvider::class,
Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
Illuminate\Session\SessionServiceProvider::class,
Illuminate\Translation\TranslationServiceProvider::class,
Illuminate\Validation\ValidationServiceProvider::class,
Illuminate\View\ViewServiceProvider::class,
Illuminate\Notifications\NotificationServiceProvider::class,
@ -149,6 +150,7 @@ return [
Pterodactyl\Providers\AuthServiceProvider::class,
Pterodactyl\Providers\EventServiceProvider::class,
Pterodactyl\Providers\RouteServiceProvider::class,
Pterodactyl\Providers\PhraseAppTranslationProvider::class,
/*
* Additional Dependencies