Merge branch 'develop' into stable

diff --combined CHANGELOG.md
index 81217bc926ddab407b364ef011a1f84a060ad136,d620c4f3ba3b5db8c09a95e5e3e7378fd2c631ee..c12deb72bae8a0db88d9c32b206a38d765e44ee6
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -4,6 -4,22 +4,22 @@@ All notable changes to this project wil
  
  The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
  
+ ## 2023.03
+ 
+ ## Fixed
+ - Allowed contentMap to be updated on edit
+ - Filter creation now accepts expires\_at
+ 
+ ### Changed
+ - Restoring the database from a dump now goes much faster without need for work-arounds
+ - Misskey reaction matching uses `content` parameter now
+ 
+ ### Added
+ - Extend the mix task `prune_objects` with option `--prune-orphaned-activities` to also prune orphaned activities, allowing to reclaim even more database space
+ 
+ ### Removed
+ - Possibility of using the `style` parameter on `span` elements. This will break certain MFM parameters.
+ 
  ## 2023.02
  
  ### Added
@@@ -142,11 -158,6 +158,11 @@@
  
  ## 2022.08
  
 +### Removed
 +- Non-finch HTTP adapters. `:tesla, :adapter` is now highly recommended to be set to the default.
 +
 +## 2022.08
 +
  ### Added
  - extended runtime module support, see config cheatsheet
  - quote posting; quotes are limited to public posts