Merge branch 'master' into glitch-soc/merge

2018-05-14 20:51:50 +02:00
parent 4665965543 03b69ebc45
commit ba7ee67498
36 changed files with 314 additions and 260 deletions
--- a/config/application.rb
+++ b/config/application.rb
@@ -68,6 +68,7 @@ module Mastodon
      :'pt-BR',
      :ru,
      :sk,
+      :sl,
      :sr,
      :'sr-Latn',
      :sv,