]> cat aescling's git repositories - mastodon.git/commitdiff
Merge pull request #1243 from ThibG/glitch-soc/merge-upstream
authorThibG <thib@sitedethib.com>
Thu, 7 Nov 2019 20:15:22 +0000 (21:15 +0100)
committerGitHub <noreply@github.com>
Thu, 7 Nov 2019 20:15:22 +0000 (21:15 +0100)
Merge upstream changes


Trivial merge