Merge branch 'master' into glitch-soc/merge
This commit is contained in:
commit
ba7ee67498
36 files changed
+314
-260
No files matched your search
@@ -21,7 +21,7 @@ module Mastodon
|
||||
end
|
||||
|
||||
def flags
|
||||
'rc1'
|
||||
'rc3'
|
||||
end
|
||||
|
||||
def to_a
|
||||
|
||||
Reference in new issue
Block a user