Merge branch 'fix/admin-api-user-deletion' into 'develop'

Fix deactivated user deletion

See merge request pleroma/pleroma!1546

diff --cc CHANGELOG.md
index 6a412bd7fce44fe97428176ca7965db3e6fb544f,1a33b04e706e88fc1e6973abd52d276509c8e5aa..7b0f4f40e5b2d96b06de201f74ebbc5223ca8dda
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -44,11 -43,10 +44,12 @@@ The format is based on [Keep a Changelo
  - Pleroma.Upload base_url was not automatically whitelisted by MediaProxy. Now your custom CDN or file hosting will be accessed directly as expected.
  - Report email not being sent to admins when the reporter is a remote user
  - MRF: ensure that subdomain_match calls are case-insensitive
 +- Reverse Proxy limiting `max_body_length` was incorrectly defined and only checked `Content-Length` headers which may not be sufficient in some circumstances
  - MRF: fix use of unserializable keyword lists in describe() implementations
+ - ActivityPub: Deactivated user deletion
  
  ### Added
 +- Conversations: Add Pleroma-specific conversation endpoints and status posting extensions. Run the `bump_all_conversations` task again to create the necessary data.
  - **Breaking:** MRF describe API, which adds support for exposing configuration information about MRF policies to NodeInfo.
    Custom modules will need to be updated by adding, at the very least, `def describe, do: {:ok, %{}}` to the MRF policy modules.
  - MRF: Support for priming the mediaproxy cache (`Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy`)

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge

diff --cc test/user_test.exs
Simple merge