Merge branch 'master' into alerts-carbon

This commit is contained in:
Tony Murray
2020-06-12 07:48:51 -05:00
committed by GitHub
1410 changed files with 588439 additions and 212515 deletions

View File

@@ -168,6 +168,7 @@ return [
Illuminate\Session\SessionServiceProvider::class,
Illuminate\Translation\TranslationServiceProvider::class,
Illuminate\Validation\ValidationServiceProvider::class,
Illuminate\View\ViewServiceProvider::class,
/*
* Application Service Providers...
@@ -179,7 +180,6 @@ return [
App\Providers\EventServiceProvider::class,
App\Providers\RouteServiceProvider::class,
App\Providers\ComposerServiceProvider::class,
App\Providers\ViewServiceProvider::class,
App\Providers\DatastoreServiceProvider::class,
/*