]> cat aescling's git repositories - mastodon.git/commitdiff
Merge pull request #1268 from ThibG/glitch-soc/merge-upstream
authorThibG <thib@sitedethib.com>
Sat, 25 Jan 2020 19:31:22 +0000 (20:31 +0100)
committerGitHub <noreply@github.com>
Sat, 25 Jan 2020 19:31:22 +0000 (20:31 +0100)
Merge upstream changes


Trivial merge