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)
commit294e08cb65940ff193d6920e576f56718a5623f4
tree5113a78b25db1d3258d7e0c752946243b7563583
parent4168ead67290fce809c8c7bf671fd9de07079da6
parent565809592cf2618291cb59adf31aea7ed0ee78bb
Merge branch 'backport/update-activity-fixes' into 'maint/1.1'

backport update activity fixes to maint/1.1

See merge request pleroma/pleroma!1797