diff options
| author | feld <feld@feld.me> | 2021-05-04 13:30:00 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-05-04 13:30:00 +0000 |
| commit | 745375bdcf2679ff803dd4ebc4a8313a7b5fb157 (patch) | |
| tree | 0b0c6996a0a1bea713851f53489e496e0087a0ab /CHANGELOG.md | |
| parent | d5263bfcf37cb1f6190d0848c6b417d33d8fb979 (diff) | |
| parent | 90770e0841d3ffea87627b35627bfe38cad52f07 (diff) | |
Merge branch 'dont-crash-email-settings' into 'develop'
Don't crash so hard when email settings are invalid
Closes #2606
See merge request pleroma/pleroma!3400
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ed6e548dd..5bb4b1e73 100644 --- 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 |