summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2021-02-20 23:18:43 +0000
committerfeld <feld@feld.me>2021-02-20 23:18:43 +0000
commit0edb5c805be97b42a68db1aa5f00c33483a0f035 (patch)
treec3f68ec77b4ea67d8ad3610eca74def722b96095
parentf6d43cec4246456003669f990c835bd14835d958 (diff)
parente31274f51dd677a0e8cd381083c4d7d87059d5d5 (diff)
Merge branch 'revert/changelog' into 'develop'
Revert changelog entry that leaked from another branch. See merge request pleroma/pleroma!3334
-rw-r--r--CHANGELOG.md1
1 files changed, 0 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6199942c1..74473b3d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,7 +59,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Ability to define custom HTTP headers per each frontend
- MRF (`NoEmptyPolicy`): New MRF Policy which will deny empty statuses or statuses of only mentions from being created by local users
- New users will receive a simple email confirming their registration if no other emails will be dispatched. (e.g., Welcome, Confirmation, or Approval Required)
-- Added Pleroma.Upload.Filter.HeifToJpeg to automate converting .heic files from Apple devices to JPEGs which can be viewed in browsers. Requires heic-convert tool from libheif.
<details>
<summary>API Changes</summary>