about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2017-12-15 01:17:12 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2017-12-15 01:17:12 +0000
commit37254c4f5d1f4397551c94e59a4d474f444b1d9a (patch)
tree8975374e2cbfced954f1bfc6de6de2652ceccf30 /lib
parente5a9831a56e7fdc0a767f0d8a059bebeabeed22f (diff)
parent098c7d27fe3a2d35d555f415717b9e019504dd91 (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
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 a6fa0ddd6..8ce31de51 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -17,7 +17,7 @@ module Mastodon
     end
 
     def pre
-      'rc5'
+      'rc6'
     end
 
     def flags