From: Mark Felder <feld@feld.me>
Date: Tue, 2 Feb 2021 18:16:49 +0000 (-0600)
Subject: Merge branch 'develop' into a1batross-develop-patch-62810
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=c118bdb8f0ab071ec99577826790dfc18057975c;p=akkoma

Merge branch 'develop' into a1batross-develop-patch-62810
---

c118bdb8f0ab071ec99577826790dfc18057975c
diff --cc CHANGELOG.md
index 3431d2afa,f4f3bddb7..e5a18bd8f
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -58,7 -60,7 +60,8 @@@ The format is based on [Keep a Changelo
  - Creating incorrect IPv4 address-style HTTP links when encountering certain numbers.
  - Reblog API Endpoint: Do not set visibility parameter to public by default and let CommonAPI to infer it from status, so a user can reblog their private status without explicitly setting reblog visibility to private.
  - Tag URLs in statuses are now absolute
+ - Removed duplicate jobs to purge expired activities
 +- Mix task pleroma.instance creates missing parent directories if the configuration or SQL output paths are changed.
  
  <details>
    <summary>API Changes</summary>