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

Conflicts:
	app/javascript/mastodon/initial_state.js
	db/schema.rb

Upstream added a new field to initial_state.
Not too sure about what happened with db/schema.rb though…

app/models/invite.rb

@@ -11,6 +11,7 @@
 #  uses       :integer          default(0), not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
+#  autofollow :boolean          default(FALSE), not null
 #
 
 class Invite < ApplicationRecord