Merge branch 'logger-configuration' into 'develop'

Fix for logger configuration through admin-fe

See merge request pleroma/pleroma!2365

diff --combined CHANGELOG.md
index 488e499de5e51df722832f0c3e7720537a08c3f3,e29be28d5e084a8ef45c91d3058bd95948aacedf..3f7fc18027295cfcedf5aa9e8dbc9acd34169cc0
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -22,6 -22,8 +22,8 @@@ The format is based on [Keep a Changelo
  - Support pagination in conversations API
  
  ## [unreleased-patch]
+ ### Fixed
+ - Logger configuration through AdminFE
  
  ## [2.0.2] - 2020-04-08
  ### Added
@@@ -67,7 -69,7 +69,7 @@@
  
  ## [2.0.0] - 2019-03-08
  ### Security
 -- Mastodon API: Fix being able to request enourmous amount of statuses in timelines leading to DoS. Now limited to 40 per request.
 +- Mastodon API: Fix being able to request enormous amount of statuses in timelines leading to DoS. Now limited to 40 per request.
  
  ### Removed
  - **Breaking**: Removed 1.0+ deprecated configurations `Pleroma.Upload, :strip_exif` and `:instance, :dedupe_media`
@@@ -121,7 -123,6 +123,7 @@@
  - Mastodon API: `pleroma.thread_muted` to the Status entity
  - Mastodon API: Mark the direct conversation as read for the author when they send a new direct message
  - Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.
 +- Mastodon API: Add `pleroma.unread_count` to the Marker entity
  - Admin API: Render whole status in grouped reports
  - Mastodon API: User timelines will now respect blocks, unless you are getting the user timeline of somebody you blocked (which would be empty otherwise).
  - Mastodon API: Favoriting / Repeating a post multiple times will now return the identical response every time. Before, executing that action twice would return an error ("already favorited") on the second try.