]> cat aescling's git repositories - mastodon.git/commitdiff
Merge pull request #1259 from ThibG/glitch-soc/merge-upstream
authorThibG <thib@sitedethib.com>
Sun, 5 Jan 2020 12:51:50 +0000 (13:51 +0100)
committerGitHub <noreply@github.com>
Sun, 5 Jan 2020 12:51:50 +0000 (13:51 +0100)
Merge upstream changes


Trivial merge