From: feld <feld@feld.me>
Date: Mon, 7 Jun 2021 20:06:36 +0000 (+0000)
Subject: Merge branch 'develop' into 'fix/prune-hashtags'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=84f42b92f0f53c569d0f7628d0a4af3ee5c06eaa;p=akkoma

Merge branch 'develop' into 'fix/prune-hashtags'

# Conflicts:
#   CHANGELOG.md
---

84f42b92f0f53c569d0f7628d0a4af3ee5c06eaa
diff --cc CHANGELOG.md
index 2c6f57691,24c029bf3..18879a6df
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -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.
+ - Checking activated Upload Filters for required commands.
 -
 -### Removed
 -- **Breaking**: Remove deprecated `/api/qvitter/statuses/notifications/read` (replaced by `/api/v1/pleroma/notifications/read`)
 +- Mix task `pleroma.database prune_objects`
  
  ## Unreleased (Patch)