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

2019-02-12 20:32:48 +01:00
parent a3ba28eb17 2f80a348c9
commit 0e34e91661
101 changed files with 2587 additions and 351 deletions
--- a/config/application.rb
+++ b/config/application.rb
@ -65,6 +65,8 @@ module Mastodon
      :ja,
      :ka,
      :ko,
+      :lv,
+      :ms,
      :nl,
      :no,
      :oc,
@ -75,6 +77,7 @@ module Mastodon
      :ru,
      :sk,
      :sl,
+      :sq,
      :sr,
      :'sr-Latn',
      :sv,