Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

This commit is contained in:
Jenkins 2017-12-15 18:17:14 +00:00
commit 40afadfb01

View file

@ -17,7 +17,7 @@ module Mastodon
end end
def pre def pre
'rc6' ''
end end
def flags def flags