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


Trivial merge