]> cat aescling's git repositories - mastodon.git/commitdiff
Merge pull request #1179 from ThibG/glitch-soc/merge-upstream
authorThibG <thib@sitedethib.com>
Mon, 29 Jul 2019 21:37:14 +0000 (23:37 +0200)
committerGitHub <noreply@github.com>
Mon, 29 Jul 2019 21:37:14 +0000 (23:37 +0200)
Merge upstream changes


Trivial merge