Merge branch 'master' into glitch-soc/merge-upstream
This commit is contained in:
commit
6f0f583abe
93 files changed
+908
-91
No files matched your search
@@ -21,7 +21,7 @@ module Mastodon
|
||||
end
|
||||
|
||||
def flags
|
||||
'rc2'
|
||||
''
|
||||
end
|
||||
|
||||
def to_a
|
||||
|
||||
Reference in new issue
Block a user