about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-07-16 15:01:13 +0200
committerGitHub <noreply@github.com>2020-07-16 15:01:13 +0200
commit801e546ecc1efb4103232d8265229eb455a8dd5b (patch)
tree4bfd6ec330f01a7187dd643d709eda81137c40a7 /lib
parent37c092e9fdedd36c167e4b84610e7346c446e1d3 (diff)
parentf94cb947671add34feb13d8d85a67260d2f699a9 (diff)
Merge pull request #1383 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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