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

main
Jenkins 2017-12-16 15:17:12 +00:00
commit 05a2a70ca2
1 changed files with 1 additions and 1 deletions

View File

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