Merge branch 'pleroma-conversations' into 'develop'
authorlain <lain@soykaf.club>
Fri, 16 Aug 2019 12:55:33 +0000 (12:55 +0000)
committerlain <lain@soykaf.club>
Fri, 16 Aug 2019 12:55:33 +0000 (12:55 +0000)
commit7ab2dbbdb60e08a6b142e62b2f50561427715bd4
tree3f7f54cabaffe26a87bafe7b2fe600e3ea34af13
parent0f24edcd8dc2e6c74d384d3fc31acfa7d2d56702
parentd3af9e19edb32e04d101e50ae2868ba6f66cbed9
Merge branch 'pleroma-conversations' into 'develop'

Extended Pleroma Conversations

See merge request pleroma/pleroma!1535
CHANGELOG.md
lib/pleroma/user.ex
lib/pleroma/web/mastodon_api/views/status_view.ex
lib/pleroma/web/streamer.ex