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
..
AppServiceProvider.php	Add IDE helper for all functions	2017-03-15 19:47:44 -04:00
AuthServiceProvider.php	Update codebase to L5.4 (#367)	2017-04-01 17:59:43 -04:00
BroadcastServiceProvider.php	Update to Laravel 5.3	2016-09-03 17:09:00 -04:00
EventServiceProvider.php	Update doc blocks for all app/	2017-03-19 19:36:50 -04:00
MacroServiceProvider.php	Finish pack management in Admin CP	2017-03-15 20:52:37 -04:00
PhraseAppTranslationProvider.php	Fix phraseapp and move config location	2017-03-19 11:55:36 -04:00
RouteServiceProvider.php	Merge remote-tracking branch 'origin/develop' into develop	2017-04-01 21:03:10 -04:00