about summary refs log tree commit diff
path: root/lib/mastodon/version.rb
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-03-15 20:45:27 +0100
committerClaire <claire.github-309c@sitedethib.com>2022-03-15 20:45:27 +0100
commitc79a03b319e17f5ab8c40d065842607de0d76108 (patch)
tree71debfede36bf8985cd5e3e37b6107560c358f57 /lib/mastodon/version.rb
parent80c4db160ecfd201cb82ed320cbe3eb32236ad20 (diff)
parente798c1c64cf417b88379e1d381592a8920fdeeab (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our README.
Diffstat (limited to 'lib/mastodon/version.rb')
-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 7c2e7161a..4ba47b4ee 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -9,15 +9,15 @@ module Mastodon
     end
 
     def minor
-      4
+      5
     end
 
     def patch
-      6
+      0
     end
 
     def flags
-      ''
+      'rc1'
     end
 
     def suffix