Merge branch 'backport/undo-fixes' into 'maint/1.1'
authorkaniini <ariadne@dereferenced.org>
Fri, 4 Oct 2019 21:29:01 +0000 (21:29 +0000)
committerkaniini <ariadne@dereferenced.org>
Fri, 4 Oct 2019 21:29:01 +0000 (21:29 +0000)
backport: undo fixes

See merge request pleroma/pleroma!1789


Trivial merge