Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
authorRoger Braun <rbraun@Bobble.local>
Mon, 23 Oct 2017 14:28:32 +0000 (16:28 +0200)
committerRoger Braun <rbraun@Bobble.local>
Mon, 23 Oct 2017 14:28:32 +0000 (16:28 +0200)

Trivial merge