diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-15 18:17:14 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-15 18:17:14 +0000 |
commit | 40afadfb01198138f665cd4700a1b067291b0464 (patch) | |
tree | 5357a0ef77194f1c046a308b0fbbf073592e1323 /lib | |
parent | e0a573a2cef924fdfec2cd7ec96a712fe2de1511 (diff) | |
parent | a29432f0cdb8e20d89789091235d56c522c53542 (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 8ce31de51..efd133f29 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -17,7 +17,7 @@ module Mastodon end def pre - 'rc6' + '' end def flags |