Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-03 04:17:11 +00:00
parent fa768abf5c 99f962ba73
commit 933840bebf
46 changed files with 1482 additions and 52 deletions
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -30,6 +30,7 @@ module SettingsHelper
    ru: 'Русский',
    sk: 'Slovensky',
    sr: 'Српски',
+    'sr-Latn': 'Srpski (latinica)',
    sv: 'Svenska',
    th: 'ภาษาไทย',
    tr: 'Türkçe',