Merge branch 'remove-conversation-api' into 'develop'

Add API endpoint to remove a conversation

Closes #2488

See merge request pleroma/pleroma!3321

diff --cc CHANGELOG.md
Simple merge

diff --cc lib/pleroma/web/router.ex
index 297f03fbd1ba7b56966e95962036069abfc28254,b8aa8c67cd9beb681311da2dbb6c86dd212678e5..e71686d31bd3a9924b472b51fe9f2e1b4bb5cd37
--- 1/lib/pleroma/web/router.ex
--- 2/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -441,8 -432,11 +441,9 @@@ defmodule Pleroma.Web.Router d
      post("/accounts/:id/mute", AccountController, :mute)
      post("/accounts/:id/unmute", AccountController, :unmute)
  
 -    get("/apps/verify_credentials", AppController, :verify_credentials)
 -
      get("/conversations", ConversationController, :index)
      post("/conversations/:id/read", ConversationController, :mark_as_read)
+     delete("/conversations/:id", ConversationController, :delete)
  
      get("/domain_blocks", DomainBlockController, :index)
      post("/domain_blocks", DomainBlockController, :create)