Merge branch 'update-activity-fixes' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Sat, 5 Oct 2019 15:51:19 +0000 (15:51 +0000)
committerkaniini <ariadne@dereferenced.org>
Sat, 5 Oct 2019 15:51:19 +0000 (15:51 +0000)
Update activity fixes

Closes #1298

See merge request pleroma/pleroma!1795


Trivial merge