]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'master' into patch-1
authornicobz25 <nico@alias-serveur.com>
Wed, 5 Apr 2017 11:48:31 +0000 (13:48 +0200)
committerGitHub <noreply@github.com>
Wed, 5 Apr 2017 11:48:31 +0000 (13:48 +0200)

Trivial merge