Merge branch 'patch-3' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Wed, 7 Aug 2019 22:14:02 +0000 (22:14 +0000)
committerrinpatch <rinpatch@sdf.org>
Wed, 7 Aug 2019 22:14:02 +0000 (22:14 +0000)
commitb18234e04c76daa564e0d8157dcd09566485da24
treeb132f78f3ad828eb4c228e869c2ed1a198a0b105
parentaa718ab8f6f290f2efb12354aff68b95e84125a4
parent9c0da1009aa2100a206fae13f88ea9faddcd6bbd
Merge branch 'patch-3' into 'develop'

Return profile URL when available instead of actor URI for MastodonAPI mention URL

Closes #1165

See merge request pleroma/pleroma!1541