]> cat aescling's git repositories - mastodon.git/commitdiff
Merge pull request #987 from ThibG/glitch-soc/merge-upstream
authorThibG <thib@sitedethib.com>
Thu, 11 Apr 2019 13:14:31 +0000 (15:14 +0200)
committerGitHub <noreply@github.com>
Thu, 11 Apr 2019 13:14:31 +0000 (15:14 +0200)
Merge upstream changes


Trivial merge