Merge branch 'main' into glitch-soc/merge-upstream

Conflicts: - `README.md`: Upstream added some documentation in the README, but our README is pretty different and barebone. Kept our README.
2021-10-14 22:14:26 +02:00
parent 7aec1bc308 ec6eee96d0
commit b2eaf5562d
19 changed files with 417 additions and 464 deletions
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -41,6 +41,7 @@ module SettingsHelper
    ka: 'ქართული',
    kab: 'Taqbaylit',
    kk: 'Қазақша',
+    kmr: 'Kurmancî',
    kn: 'ಕನ್ನಡ',
    ko: '한국어',
    ku: 'سۆرانی',