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
..
admin	Merge branch 'develop' into feature/option-scripts	2017-04-20 17:08:08 -04:00
auth	remove ReCaptcha from views if it is disabled	2017-03-31 12:26:57 +02:00
base	Fix password error when changing account email, closes #379	2017-04-17 20:35:07 -04:00
errors	Move everything over to pterodactyl theme	2017-03-16 19:48:24 -04:00
layouts	Add console popout option.	2017-04-15 18:23:29 -04:00
server	Fix display of subusers after creation.	2017-04-17 21:44:58 -04:00
vendor	Initial change of theme.	2017-01-14 21:32:33 -05:00