From: Lior Broshi <redacted>
Date: Sun, 29 Dec 2019 21:03:10 +0000 (+0200)
Subject: resolved conflict
X-Git-Tag: v0.28.3~1^2~22^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/23ad8024ec64eea1354daf2e9c947bb25d586798

resolved conflict
---

diff --git a/app/Config/app.php b/app/Config/app.php
index 273e6febf..27978bd1d 100755
--- a/app/Config/app.php
+++ b/app/Config/app.php
@@ -52,7 +52,7 @@ return [
     'locale' => env('APP_LANG', 'en'),
 
     // Locales available
-    'locales' => ['en', 'ar', 'de', 'de_informal', 'es', 'es_AR', 'fr', 'he', 'nl', 'pt_BR', 'sk', 'cs', 'sv', 'kr', 'ja', 'pl', 'it', 'ru', 'uk', 'zh_CN', 'zh_TW'],
+    'locales' => ['en', 'ar', 'de', 'de_informal', 'es', 'es_AR', 'fr', 'he', 'nl', 'pt_BR', 'sk', 'cs', 'sv', 'kr', 'ja', 'pl', 'it', 'ru', 'uk', 'zh_CN', 'zh_TW', 'tr'],
 
     //  Application Fallback Locale
     'fallback_locale' => 'en',