Merge branch 'dont-crash-email-settings' into 'develop'

[akkoma] / CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed6e548dd377920882e0e29952eb3707c9ddf671..5bb4b1e7370f6d7b5cfb0777ae06343de9783ec9 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - MRF (`FollowBotPolicy`): New MRF Policy which makes a designated local Bot account attempt to follow all users in public Notes received by your instance. Users who require approving follower requests or have #nobot in their profile are excluded.
 - Return OAuth token `id` (primary key) in POST `/oauth/token`.
 
+### Fixed
+- Don't crash so hard when email settings are invalid.
+
 ## Unreleased (Patch)
 
 ### Fixed