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

This commit is contained in:
Jenkins committed 2017-12-08 13:17:14 +00:00
commit 776867ea73
77 files changed
+1799 -545

No files matched your search

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