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

2018-07-26 21:22:43 +02:00
parent 82ab5aacb2 3c35b34b61
commit 6141c2a035
72 changed files with 741 additions and 85 deletions
--- a/config/application.rb
+++ b/config/application.rb
@ -39,6 +39,7 @@ module Mastodon
    config.i18n.available_locales = [
      :en,
      :ar,
+      :ast,
      :bg,
      :ca,
      :co,