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

Conflicts:
	README.md

Discarded upstream changes to the README, kept our version.

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index e4944ba67..0442a156d 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -21,7 +21,7 @@ module Mastodon
     end
 
     def flags
-      'rc2'
+      ''
     end
 
     def to_a