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

Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both.
2018-09-11 16:51:26 +02:00
parent 65f625cf23 bda0f7ac73
commit cd99255698
27 changed files with 506 additions and 148 deletions
--- a/config/application.rb
+++ b/config/application.rb
@ -43,6 +43,7 @@ module Mastodon
      :bg,
      :ca,
      :co,
+      :cs,
      :cy,
      :da,
      :de,