Dane Everitt 5927e0e12a Merge remote-tracking branch 'origin/develop' into develop ... # Conflicts: # app/Http/Controllers/Base/LanguageController.php # app/Http/Kernel.php # app/Http/Middleware/TrimStrings.php # app/Providers/RouteServiceProvider.php		2017-04-01 21:03:10 -04:00
..
Controllers	Cleanup routing mechanisms	2017-04-01 21:01:10 -04:00
Middleware	Cleanup routing mechanisms	2017-04-01 21:01:10 -04:00
Requests	Initial Commit of Files	2015-12-06 13:58:49 -05:00
Routes	Cleanup routing mechanisms	2017-04-01 21:01:10 -04:00
Kernel.php	Cleanup routing mechanisms	2017-04-01 21:01:10 -04:00