Merge remote-tracking branch 'forked/2.4' into upgrade-google2fa

# Conflicts: # composer.lock
2019-07-13 10:39:25 +03:00
parent 87281f905a 3d0322dded
commit 2b2337eb8e
55 changed files with 788 additions and 991 deletions
--- a/config/app.php
+++ b/config/app.php
@@ -185,7 +185,6 @@ return [
        GrahamCampbell\Security\SecurityServiceProvider::class,
        Jenssegers\Date\DateServiceProvider::class,
        Laravel\Tinker\TinkerServiceProvider::class,
-        Laravolt\Avatar\ServiceProvider::class,
        McCool\LaravelAutoPresenter\AutoPresenterServiceProvider::class,

        /*