diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-13 20:17:13 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-13 20:17:13 +0000 |
commit | 10f800ab46f992294907150177bdbf3e8265c915 (patch) | |
tree | 9769945a3c723465bed87760d9ce4b981efe3036 /lib | |
parent | 82236a37039043d134efb3ddbdd2a3e04e714e2c (diff) | |
parent | 7cad9264011a0e890fb20334b3e7d4003c055d68 (diff) |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'lib')
-rw-r--r-- | lib/mastodon/version.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index a430ac225..a6fa0ddd6 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -17,7 +17,7 @@ module Mastodon end def pre - 'rc4' + 'rc5' end def flags |