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/config/application.rb
+++ b/config/application.rb
@@ -58,6 +58,7 @@ module Mastodon
      :ru,
      :sk,
      :sr,
+      :'sr-Latn',
      :sv,
      :th,
      :tr,