]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'master' into patch-1
authorVirtuBox <contact@virtubox.net>
Thu, 6 Apr 2017 17:11:39 +0000 (19:11 +0200)
committerGitHub <noreply@github.com>
Thu, 6 Apr 2017 17:11:39 +0000 (19:11 +0200)

Trivial merge