]> cat aescling's git repositories - mastodon.git/commitdiff
Merge pull request #978 from ThibG/glitch-soc/merge-upstream
authorThibG <thib@sitedethib.com>
Mon, 1 Apr 2019 19:36:36 +0000 (21:36 +0200)
committerGitHub <noreply@github.com>
Mon, 1 Apr 2019 19:36:36 +0000 (21:36 +0200)
Merge upstream changes


Trivial merge