Merge branch 'backport/update-activity-fixes' into 'maint/1.1'
authorkaniini <ariadne@dereferenced.org>
Sat, 5 Oct 2019 19:46:23 +0000 (19:46 +0000)
committerkaniini <ariadne@dereferenced.org>
Sat, 5 Oct 2019 19:46:23 +0000 (19:46 +0000)
backport update activity fixes to maint/1.1

See merge request pleroma/pleroma!1797


Trivial merge