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

Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index a0e32a7e0..b35dd0561 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      3
+      4
     end
 
     def pre