Merge branch 'master' into glitch-soc/merge-upstream
This commit is contained in:
commit
a07e37cc17
11 files changed
+46
-37
No files matched your search
@@ -13,7 +13,7 @@ module Mastodon
|
||||
end
|
||||
|
||||
def patch
|
||||
3
|
||||
4
|
||||
end
|
||||
|
||||
def pre
|
||||
|
||||
Reference in new issue
Block a user