Merge branch 'master' into translations

[bookstack] / config / app.php

diff --git a/config/app.php b/config/app.php
index a5b0d2fe0e325399440d6e2250035fd1412f7e6f..786f005ac963f2bf2836c7038c7f534b7a3088c2 100644 (file)
--- a/config/app.php
+++ b/config/app.php
@@ -57,7 +57,7 @@ return [
     |
     */
 
-    'locale' => 'en',
+    'locale' => env('APP_LANG', 'en'),
 
     /*
     |--------------------------------------------------------------------------