Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
authorRoger Braun <roger@rogerbraun.net>
Sun, 16 Apr 2017 09:52:04 +0000 (11:52 +0200)
committerRoger Braun <roger@rogerbraun.net>
Sun, 16 Apr 2017 09:52:04 +0000 (11:52 +0200)

Trivial merge