]> cat aescling's git repositories - mastodon.git/commitdiff
Merge pull request #1278 from ThibG/glitch-soc/merge-upstream
authorThibG <thib@sitedethib.com>
Thu, 6 Feb 2020 21:48:26 +0000 (22:48 +0100)
committerGitHub <noreply@github.com>
Thu, 6 Feb 2020 21:48:26 +0000 (22:48 +0100)
Merge upstream changes


Trivial merge