Merge branch 'fix/put-correct-activity-url' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Wed, 24 Jul 2019 19:28:21 +0000 (19:28 +0000)
committerkaniini <ariadne@dereferenced.org>
Wed, 24 Jul 2019 19:28:21 +0000 (19:28 +0000)
commit931c4974ee4a5e5e806433ce7b367928e4210e0c
tree453b14e77c37a00da1ed35eb6dd781cb46055d70
parentacd20914ec5a2cedfcd6a7405a22b6453d951164
parentb20020da160404f6f668eec2a2a42aaa2b6a09b2
Merge branch 'fix/put-correct-activity-url' into 'develop'

Show the url advertised in the Activity in the Status JSON response

Closes #1077

See merge request pleroma/pleroma!1485