Merge branch 'patch-2' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Tue, 5 Feb 2019 11:29:20 +0000 (11:29 +0000)
committerlambda <pleromagit@rogerbraun.net>
Tue, 5 Feb 2019 11:29:20 +0000 (11:29 +0000)
ARGLE GARBLE

See merge request pleroma/pleroma!776


Trivial merge