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

This commit is contained in:
Thibaut Girka committed 2018-12-01 21:00:16 +01:00
commit a07e37cc17
11 files changed
+46 -37

No files matched your search

+1 -1
View File
@@ -13,7 +13,7 @@ module Mastodon
end
def patch
3
4
end
def pre