]> cat aescling's git repositories - mastodon.git/commitdiff
Merge pull request #1247 from ThibG/glitch-soc/merge-upstream
authorThibG <thib@sitedethib.com>
Sat, 23 Nov 2019 23:36:35 +0000 (00:36 +0100)
committerGitHub <noreply@github.com>
Sat, 23 Nov 2019 23:36:35 +0000 (00:36 +0100)
Merge upstream changes


Trivial merge