]> cat aescling's git repositories - mastodon.git/commitdiff
Merge pull request #222 from yipdw/merge/tootsuite/master
authorDavid Yip <yipdw@member.fsf.org>
Fri, 17 Nov 2017 20:35:16 +0000 (14:35 -0600)
committerGitHub <noreply@github.com>
Fri, 17 Nov 2017 20:35:16 +0000 (14:35 -0600)
Merge upstream (e28b33c.. 94c5a11)


Trivial merge