about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-08-26 13:23:52 +0200
committerGitHub <noreply@github.com>2018-08-26 13:23:52 +0200
commit2903f8f36b7c41b77de4ad6c8c5b0a6c0b2a7ace (patch)
tree4c8d12cc031476870a918bec3b3000f899101a32 /lib
parent0ddf439999b05b5dfd6d5a5257327fa7d3565e65 (diff)
parent246c313d457397f412f9fb5eed3ee02cf5d9a561 (diff)
Merge pull request #671 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 1aa9b413e..d07108ad4 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -9,11 +9,11 @@ module Mastodon
     end
 
     def minor
-      4
+      5
     end
 
     def patch
-      3
+      0
     end
 
     def pre
@@ -21,7 +21,7 @@ module Mastodon
     end
 
     def flags
-      ''
+      'rc1'
     end
 
     def to_a