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


Trivial merge