From: ThibG Date: Wed, 17 Jul 2019 14:56:10 +0000 (+0200) Subject: Merge pull request #1164 from ThibG/glitch-soc/cherry-pick-upstream X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e9cc17bbeab1f1d47b5a919adb0ae7eae4eee791;p=mastodon.git Merge pull request #1164 from ThibG/glitch-soc/cherry-pick-upstream Cherry-pick changes from upstream --- e9cc17bbeab1f1d47b5a919adb0ae7eae4eee791