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

This commit is contained in:
Jenkins committed 2017-12-13 18:17:16 +00:00
commit 82236a3703
59 files changed
+855 -568

No files matched your search

+1 -1
View File
@@ -17,7 +17,7 @@ module Mastodon
end
def pre
'rc3'
'rc4'
end
def flags