]> cat aescling's git repositories - mastodon.git/commitdiff
Merge pull request #1317 from ThibG/glitch-soc/merge-upstream
authorThibG <thib@sitedethib.com>
Wed, 15 Apr 2020 16:24:41 +0000 (18:24 +0200)
committerGitHub <noreply@github.com>
Wed, 15 Apr 2020 16:24:41 +0000 (18:24 +0200)
Merge upstream changes


Trivial merge