about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-02-03 10:27:07 +0100
committerGitHub <noreply@github.com>2020-02-03 10:27:07 +0100
commit94cdbc4982bde9709a633d26ff9a083dd9661258 (patch)
tree66a2d3ef757eb5f7ed7b57a7dc215e77c0a18e97 /lib
parent4cd2d13bd226c005317adf9848f4c0316401b2ff (diff)
parent3dcb279da31bc7810b7f58991dad4f886aaade34 (diff)
Merge pull request #1274 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'lib')
-rw-r--r--lib/mastodon/version.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index e0549d0a5..4a56470d0 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -17,7 +17,7 @@ module Mastodon
     end
 
     def flags
-      'rc1'
+      'rc2'
     end
 
     def suffix