Merge branch 'master' into glitch-soc/merge-upstream

This commit is contained in:
Thibaut Girka committed 2018-07-11 17:57:08 +02:00
commit 6f0f583abe
93 files changed
+908 -91

No files matched your search

+1 -1
View File
@@ -21,7 +21,7 @@ module Mastodon
end
def flags
'rc2'
''
end
def to_a