From: kaniini <ariadne@dereferenced.org>
Date: Sat, 5 Oct 2019 19:46:23 +0000 (+0000)
Subject: Merge branch 'backport/update-activity-fixes' into 'maint/1.1'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=294e08cb65940ff193d6920e576f56718a5623f4;hp=-c;p=akkoma

Merge branch 'backport/update-activity-fixes' into 'maint/1.1'

backport update activity fixes to maint/1.1

See merge request pleroma/pleroma!1797
---

294e08cb65940ff193d6920e576f56718a5623f4