1
1
mirror of https://github.com/pterodactyl/panel.git synced 2024-10-27 12:22:28 +01:00
Pterodactyl-Panel/app/Http/Controllers
Dane Everitt 800e2df6b2
Merge branch 'develop' into feature/api-v1
# Conflicts:
#	app/Contracts/Repository/RepositoryInterface.php
#	app/Repositories/Eloquent/EloquentRepository.php
#	app/Services/Nodes/NodeUpdateService.php
#	tests/Unit/Services/Nodes/NodeUpdateServiceTest.php
2018-01-10 20:55:22 -06:00
..
Admin Fix allocation behavior, closes #712 2018-01-08 22:12:19 -06:00
API Add location control through API 2018-01-03 21:14:53 -06:00
Auth Update to Laravel 5.5 (#814) 2017-12-17 13:07:38 -06:00
Base Refactor how repositories for the daemon work. 2018-01-05 18:27:47 -06:00
Daemon Fix inability to create a server 2017-11-05 15:36:37 -06:00
Server Merge branch 'develop' into feature/api-v1 2018-01-10 20:55:22 -06:00
Controller.php Initial Commit of Files 2015-12-06 13:58:49 -05:00