From: feld <feld@feld.me>
Date: Thu, 15 Apr 2021 14:59:26 +0000 (+0000)
Subject: Merge branch 'develop' into 'fix/notifsettings-breaking-login'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=0a7c2a32badc8520d90146d5a1aae7907a679614;p=akkoma

Merge branch 'develop' into 'fix/notifsettings-breaking-login'

# Conflicts:
#   CHANGELOG.md
---

0a7c2a32badc8520d90146d5a1aae7907a679614
diff --cc CHANGELOG.md
index 31a22bb31,6e13b3875..9b0678023
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -13,7 -19,8 +19,9 @@@ The format is based on [Keep a Changelo
  ### Fixed
  
  - Try to save exported ConfigDB settings (migrate_from_db) in the system temp directory if default location is not writable.
+ - Uploading custom instance thumbnail via AdminAPI/AdminFE generated invalid URL to the image
+ - Applying ConcurrentLimiter settings via AdminAPI
 +- User login failures if their `notification_settings` were in a NULL state.
  
  ## [2.3.0] - 2020-03-01