]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' of github.com:tootsuite/mastodon
authorOlivia Mossberg <hakurou46@gmail.com>
Sun, 2 Apr 2017 15:04:31 +0000 (17:04 +0200)
committerOlivia Mossberg <hakurou46@gmail.com>
Sun, 2 Apr 2017 15:04:31 +0000 (17:04 +0200)
commit30da6440d06803fe9797dc5a5741c49da93892b4
tree170ebee825dd478476ee20aff3b0390261d4a8d5
parentf4b5fe9cafe7f6b5a590b45970e48b15c34c262f
parent4b7dca47130b97e2f213cb28def741c6dee46ff1
Merge branch 'master' of github.com:tootsuite/mastodon

It's just an upstream merge