]> cat aescling's git repositories - mastodon.git/commitdiff
Merge pull request #955 from ThibG/glitch-soc/merge-upstream
authorThibG <thib@sitedethib.com>
Mon, 11 Mar 2019 16:52:18 +0000 (17:52 +0100)
committerGitHub <noreply@github.com>
Mon, 11 Mar 2019 16:52:18 +0000 (17:52 +0100)
Merge upstream changes


Trivial merge