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)
commit1dd6d81ddf6a4d20830a7a9086e843b4aafda05f
tree895ef7c5d8efd7769c4f2ef83ff912bd81d5f42b
parent923dff21b3feeecd17752005f7f7a97862a92e00
parenta859abed2eff7380e5c06c0f6aa4d95d7386d9e7
Merge branch 'backport/issue-1296' into 'maint/1.1'

backport 1296 fix to maint/1.1

See merge request pleroma/pleroma!1790