about summary refs log tree commit diff
path: root/config/application.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-01-20 19:20:40 +0100
committerGitHub <noreply@github.com>2020-01-20 19:20:40 +0100
commita8c109baca4d02cc8aed454e231518c1f8ec1844 (patch)
treea828f3968b151924656061bfc709b00565aff877 /config/application.rb
parentddcf78d8d3e2a8cb9aa04f8ff42f9d8e185b0354 (diff)
parentdc2ab6e646bb721ef2e1be268b876bd00e8fa802 (diff)
Merge pull request #1264 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/application.rb')
-rw-r--r--config/application.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index 58e59fd51..c1bc18a30 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -70,6 +70,7 @@ module Mastodon
       :hy,
       :id,
       :io,
+      :is,
       :it,
       :ja,
       :ka,