From: Abijeet Patro <redacted>
Date: Tue, 18 Apr 2017 19:53:21 +0000 (+0530)
Subject: Merge pull request #9 from BookStackApp/master
X-Git-Tag: v0.18.0~1^2~45^2^2~30^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/9de85283cd6a333898cc31f8d9242d42d23008d2?ds=inline;hp=-c

Merge pull request #9 from BookStackApp/master

Get the latest changes.
---

9de85283cd6a333898cc31f8d9242d42d23008d2
diff --combined config/app.php
index b730e6303,e70724dce..feab6651c
--- 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),
  
      /*
      |--------------------------------------------------------------------------
@@@ -100,7 -100,7 +100,7 @@@
      |
      */
  
-     'log' => 'single',
+     'log' => env('APP_LOGGING', 'single'),
  
      /*
      |--------------------------------------------------------------------------