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

Conflicts:
	.circleci/config.yml
	app/controllers/authorize_follows_controller.rb
	app/javascript/packs/public.js

Moved new stuff from packs/public.js to core/public.js.
Added appropriate use_pack in new controllers.

config/application.rb

@@ -61,6 +61,7 @@ module Mastodon
       :io,
       :it,
       :ja,
+      :ka,
       :ko,
       :nl,
       :no,