about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-02-03 09:22:58 +0100
committerThibaut Girka <thib@sitedethib.com>2020-02-03 09:22:58 +0100
commit369201a425f7b539290815402a4bc65923911e11 (patch)
tree45de36cd6aa8c22aaf4be6cefaeeb70218d4daf5 /lib
parent4cd2d13bd226c005317adf9848f4c0316401b2ff (diff)
parent3adc722d1cdd28d87d2724b8952d7ec52d241b52 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
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