Merge branch 'conversations_three' into 'develop'
authorlambda <lain@soykaf.club>
Tue, 7 May 2019 14:43:21 +0000 (14:43 +0000)
committerlambda <lain@soykaf.club>
Tue, 7 May 2019 14:43:21 +0000 (14:43 +0000)
commit238dd72fad2452a8da594e68b8e6c80d709587e8
tree050a8e55ae39047e197b0e84c9fed8bacaf91545
parent6518644db1d31f2b30b95fa0899b3751bc330d56
parentc42ded13a2caa02f3f5aa00accce69b183546f9e
Merge branch 'conversations_three' into 'develop'

Conversations once more.

See merge request pleroma/pleroma!1119
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
mix.exs
mix.lock
test/web/mastodon_api/mastodon_api_controller_test.exs