From: ThibG Date: Sun, 14 Jul 2019 23:04:31 +0000 (+0200) Subject: Merge pull request #1161 from ThibG/glitch-soc/cherry-pick-upstream X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=5ccd011cc3bafc00a557dabbb47da004f3d4a381;p=mastodon.git Merge pull request #1161 from ThibG/glitch-soc/cherry-pick-upstream Cherry pick changes from upstream --- 5ccd011cc3bafc00a557dabbb47da004f3d4a381