Alex/Pterodactyl-Panel
1
1
Fork 1
mirror of https://github.com/pterodactyl/panel.git synced 2024-11-22 09:02:28 +01:00
Code Issues Releases Wiki Activity

Merge branch 'development' into add-restful-api

Browse Source
This commit is contained in:
Dane Everitt 2016-01-11 23:20:12 -05:00
commit c080025bab
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@ -10,7 +10,6 @@
"barryvdh/laravel-debugbar": "^2.0",
"doctrine/dbal": "^2.5",
"guzzlehttp/guzzle": "^6.1",
"kris/laravel-form-builder": "^1.6",
"pragmarx/google2fa": "^0.7.1",
"webpatser/laravel-uuid": "^2.0",
"prologue/alerts": "^0.4.0",

2
config/app.php
View File

@ -149,7 +149,6 @@ return [
* Additional Dependencies
*/
Barryvdh\Debugbar\ServiceProvider::class,
Kris\LaravelFormBuilder\FormBuilderServiceProvider::class,
PragmaRX\Google2FA\Vendor\Laravel\ServiceProvider::class,
Prologue\Alerts\AlertsServiceProvider::class,
@ -183,7 +182,6 @@ return [
'Eloquent' => Illuminate\Database\Eloquent\Model::class,
'Event' => Illuminate\Support\Facades\Event::class,
'File' => Illuminate\Support\Facades\File::class,
'FormBuilder' => Kris\LaravelFormBuilder\Facades\FormBuilder::class,
'Gate' => Illuminate\Support\Facades\Gate::class,
'Google2FA' => PragmaRX\Google2FA\Vendor\Laravel\Facade::class,
'Hash' => Illuminate\Support\Facades\Hash::class,