]> cat aescling's git repositories - mastodon.git/commitdiff
Merge pull request #1240 from ThibG/glitch-soc/merge-upstream
authorThibG <thib@sitedethib.com>
Mon, 28 Oct 2019 15:25:55 +0000 (16:25 +0100)
committerGitHub <noreply@github.com>
Mon, 28 Oct 2019 15:25:55 +0000 (16:25 +0100)
Merge upstream changes


Trivial merge