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)
commit0ee6100c8d7d21eb0c7cdd1c098a5071c0b9682f
tree3c97ab34e7c6d7a99d6a81bcc16ad266a8540dc9
parente51c20f28a91028b06a5783601e4ce09536bba5b
parent276a52016307707fa6a2f91bd9a3038dcfb71ba7
Merge branch 'update-activity-fixes' into 'develop'

Update activity fixes

Closes #1298

See merge request pleroma/pleroma!1795