about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-07-16 14:43:50 +0200
committerThibaut Girka <thib@sitedethib.com>2020-07-16 14:43:50 +0200
commit1c6c40d17c233171c6252503df10da72fd039cf6 (patch)
tree2827f6bf22d6356f8c2103cecfa260608050f67f /lib
parent37c092e9fdedd36c167e4b84610e7346c446e1d3 (diff)
parentea13e80030117c95f5e52d730d00093e21b11eea (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'lib')
-rw-r--r--lib/mastodon/version.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 87fc67deb..2a1783c95 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -9,15 +9,15 @@ module Mastodon
     end
 
     def minor
-      1
+      2
     end
 
     def patch
-      5
+      0
     end
 
     def flags
-      ''
+      'rc1'
     end
 
     def suffix