From: Abijeet Patro <redacted>
Date: Sun, 5 Feb 2017 11:16:03 +0000 (+0530)
Subject: Merge pull request #7 from BookStackApp/master
X-Git-Tag: v0.18.0~1^2~45^2^2~32^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/388f2f40dc88727d18eeb7865dd1088691a3459e?ds=inline;hp=-c

Merge pull request #7 from BookStackApp/master

Getting the latest.
---

388f2f40dc88727d18eeb7865dd1088691a3459e
diff --combined config/app.php
index 2a7a36ea2,bf4f84fc7..b730e6303
--- a/config/app.php
+++ b/config/app.php
@@@ -3,7 -3,7 +3,7 @@@
  return [
  
  
 -    'env' => env('APP_ENV', 'production'),
 +    'env' => env('APP_ENV', 'development'),
  
      'editor' => env('APP_EDITOR', 'html'),
  
@@@ -18,7 -18,7 +18,7 @@@
      |
      */
  
 -    'debug' => env('APP_DEBUG', false),
 +    'debug' => env('APP_DEBUG', true),
  
      /*
      |--------------------------------------------------------------------------
@@@ -139,7 -139,7 +139,7 @@@
          Illuminate\Validation\ValidationServiceProvider::class,
          Illuminate\View\ViewServiceProvider::class,
          Illuminate\Notifications\NotificationServiceProvider::class,
-         Laravel\Socialite\SocialiteServiceProvider::class,
+         SocialiteProviders\Manager\ServiceProvider::class,
  
          /**
           * Third Party