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

Conflicts:
	config/locales/simple_form.ja.yml

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 60f133085..ae435e6eb 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -21,7 +21,7 @@ module Mastodon
     end
 
     def flags
-      'rc3'
+      'rc4'
     end
 
     def to_a