Merge branch 'align-mastodon-conversations' into 'develop'
authorlambda <lain@soykaf.club>
Mon, 3 Jun 2019 09:48:37 +0000 (09:48 +0000)
committerlambda <lain@soykaf.club>
Mon, 3 Jun 2019 09:48:37 +0000 (09:48 +0000)
commit314758c25bbc0044afcec98710c36532a1dc7e0d
tree56f737d7ee009acd73726345085b95a89b182191
parente71da4468e8f6e9e4f45a48f6fb266a89eade541
parent97fb50d9faaea509e3e7809689f4aa045634fa81
Merge branch 'align-mastodon-conversations' into 'develop'

Mastodon Conversations API: Align to Mastodon behavior

See merge request pleroma/pleroma!1215
test/web/mastodon_api/mastodon_api_controller_test.exs