Merge remote-tracking branch 'origin/master' into merge-upstream-20180121

2018-01-21 16:26:50 -06:00
parent 1253279feb 48cd6dc6ca
commit 48d79007f6
3 changed files with 265 additions and 0 deletions
--- a/config/application.rb
+++ b/config/application.rb
@ -47,6 +47,7 @@ module Mastodon
      :he,
      :hr,
      :hu,
+      :hy,
      :id,
      :io,
      :it,