]> cat aescling's git repositories - mastodon.git/commitdiff
Merge pull request #886 from ThibG/glitch-soc/merge-upstream
authorThibG <thib@sitedethib.com>
Mon, 14 Jan 2019 10:48:36 +0000 (11:48 +0100)
committerGitHub <noreply@github.com>
Mon, 14 Jan 2019 10:48:36 +0000 (11:48 +0100)
Merge upstream changes


Trivial merge