Merge remote-tracking branch 'origin/develop' into pleroma-conversations
authorlain <lain@soykaf.club>
Wed, 14 Aug 2019 13:30:40 +0000 (15:30 +0200)
committerlain <lain@soykaf.club>
Wed, 14 Aug 2019 13:30:40 +0000 (15:30 +0200)
commit560dbad538ba978d00116b1b037502ba2185cb5e
tree1f133f4ae7480228fbf55a8e5741c0e60bdf24d0
parent2674db14a2ee29e98265c0c0b1db412835b6bbed
parent744e2ce8b4286c41dbea33c1b918bc92b774307e
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
CHANGELOG.md
lib/pleroma/user.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/mastodon_api/views/status_view.ex
lib/pleroma/web/router.ex