Alex/Pterodactyl-Panel
1
1
Fork 1
mirror of https://github.com/pterodactyl/panel.git synced 2024-10-27 20:32:28 +01:00
Code Issues Releases Wiki Activity
8d24e5f168
Pterodactyl-Panel/app/Http/Routes
History
Dane Everitt 8d24e5f168
Merge branch 'develop' into feature/option-scripts 
# Conflicts:
#	app/Http/Routes/AdminRoutes.php
#	app/Http/Routes/DaemonRoutes.php
#	app/Models/ServiceOption.php
2017-04-20 17:08:08 -04:00
..
AdminRoutes.php Cleanup routing mechanisms 2017-04-01 21:01:10 -04:00
DaemonRoutes.php Cleanup routing mechanisms 2017-04-01 21:01:10 -04:00