Merge branch 'dont-crash-email-settings' into 'develop'
authorfeld <feld@feld.me>
Tue, 4 May 2021 13:30:00 +0000 (13:30 +0000)
committerfeld <feld@feld.me>
Tue, 4 May 2021 13:30:00 +0000 (13:30 +0000)
Don't crash so hard when email settings are invalid

Closes #2606

See merge request pleroma/pleroma!3400

1  2 
CHANGELOG.md

diff --cc CHANGELOG.md
Simple merge