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


Trivial merge