Merge branch 'backport/issue-1296' into 'maint/1.1'
authorkaniini <ariadne@dereferenced.org>
Fri, 4 Oct 2019 21:47:34 +0000 (21:47 +0000)
committerkaniini <ariadne@dereferenced.org>
Fri, 4 Oct 2019 21:47:34 +0000 (21:47 +0000)
backport 1296 fix to maint/1.1

See merge request pleroma/pleroma!1790


Trivial merge