Merge upstream!! #64 <3 <3

2017-07-12 02:03:17 -07:00
parent bcf7ee48e9 056b5ed72f
commit 79d898ae0a
340 changed files with 4980 additions and 2321 deletions
--- a/config/application.rb
+++ b/config/application.rb
@@ -45,6 +45,7 @@ module Mastodon
      :io,
      :it,
      :ja,
+      :ko,
      :nl,
      :no,
      :oc,