Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
authordtluna <dtluna@openmailbox.org>
Tue, 20 Jun 2017 14:57:04 +0000 (17:57 +0300)
committerdtluna <dtluna@openmailbox.org>
Tue, 20 Jun 2017 14:57:04 +0000 (17:57 +0300)

Trivial merge