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
API	Fix server deletion logic, and clean up suspend/unsuspend operations	2017-04-17 20:16:05 -04:00
Auth	Improved login controller func. for 2FA, throws Failed event correctly now	2017-04-14 14:33:15 -04:00
Base	Fix extraneous MySQL calls being made for each server record listed on page.	2017-04-14 01:25:56 -04:00
Daemon	Merge branch 'develop' into feature/option-scripts	2017-04-20 17:08:08 -04:00
Remote	Fix autodeploy time checking.	2017-04-17 21:37:45 -04:00
Server	Set correct console frequency	2017-04-17 21:54:26 -04:00
Controller.php	Initial Commit of Files	2015-12-06 13:58:49 -05:00