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
..
Controllers	Merge branch 'develop' into feature/option-scripts	2017-04-20 17:08:08 -04:00
Middleware	Apply fixes from StyleCI (#372)	2017-04-09 19:16:39 -04:00
Requests	Initial Commit of Files	2015-12-06 13:58:49 -05:00
Routes	Merge branch 'develop' into feature/option-scripts	2017-04-20 17:08:08 -04:00
Kernel.php	Initial moves to new API scheme.	2017-04-02 00:11:52 -04:00