diff options
author | David Yip <yipdw@member.fsf.org> | 2018-01-21 16:26:50 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-01-21 16:26:50 -0600 |
commit | 48d79007f616ba03f663d29536927f6ab14e4b53 (patch) | |
tree | 23527a9cb6a9a2951cb1b04a51a8dda1271049bf /config | |
parent | 1253279febc05c96e4ec875588a0c1c6d723b23c (diff) | |
parent | 48cd6dc6cad54af94bef93e3c311d6c7dd420e63 (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream-20180121
Diffstat (limited to 'config')
-rw-r--r-- | config/application.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index ef97dbc06..17bb02b3f 100644 --- a/config/application.rb +++ b/config/application.rb @@ -47,6 +47,7 @@ module Mastodon :he, :hr, :hu, + :hy, :id, :io, :it, |