Merge branch 'develop' into 'fix/prune-hashtags'
authorfeld <feld@feld.me>
Mon, 7 Jun 2021 20:06:36 +0000 (20:06 +0000)
committerfeld <feld@feld.me>
Mon, 7 Jun 2021 20:06:36 +0000 (20:06 +0000)
# Conflicts:
#   CHANGELOG.md

1  2 
CHANGELOG.md

diff --cc CHANGELOG.md
index 2c6f57691ba399fd5d70d147e6fbc603f8d953d8,24c029bf334d2794ebcd0c02251003292a5a2b53..18879a6dfc7bc8b7d2f71ca84960e2442b97e81b
@@@ -18,7 -24,10 +24,8 @@@ The format is based on [Keep a Changelo
  
  ### Fixed
  - Don't crash so hard when email settings are invalid.
 -
 -### Removed
 -- **Breaking**: Remove deprecated `/api/qvitter/statuses/notifications/read` (replaced by `/api/v1/pleroma/notifications/read`)
+ - Checking activated Upload Filters for required commands.
 +- Mix task `pleroma.database prune_objects`
  
  ## Unreleased (Patch)