Merge mrf_simple-reject with quarantine (#137)

[akkoma] / CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6010744dd50b543b1b6f31bac364109e2cc9d56c..c658af46064fad6dd67f8c11d62c223f2d901041 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 - quarantining is now considered absolutely; public activities are no longer
   an exception.
+- also merged quarantine and mrf reject - quarantine is now deprecated
 - flavours:
   - amd64 is built for debian stable. Compatible with ubuntu 20.
   - ubuntu-jammy is built for... well, ubuntu 22 (LTS)