]> cat aescling's git repositories - mastodon.git/commitdiff
Merge pull request #224 from yipdw/merge-upstream
authorDavid Yip <yipdw@member.fsf.org>
Fri, 17 Nov 2017 23:58:13 +0000 (17:58 -0600)
committerGitHub <noreply@github.com>
Fri, 17 Nov 2017 23:58:13 +0000 (17:58 -0600)
Merge upstream (tootsuite/mastodon#5703)


Trivial merge