From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Tue, 10 Dec 2019 05:55:14 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=835ac2157c53e8c85bd3759efe061dbfbdfc367e;p=akkoma

Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes

# Conflicts:
#	CHANGELOG.md
---

835ac2157c53e8c85bd3759efe061dbfbdfc367e
diff --cc CHANGELOG.md
index 007c6f114,847dbe902..bb3273286
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -45,7 -49,7 +49,8 @@@ The format is based on [Keep a Changelo
  - Mix task to list all users (`mix pleroma.user list`)
  - Support for `X-Forwarded-For` and similar HTTP headers which used by reverse proxies to pass a real user IP address to the backend. Must not be enabled unless your instance is behind at least one reverse proxy (such as Nginx, Apache HTTPD or Varnish Cache).
  - MRF: New module which handles incoming posts based on their age. By default, all incoming posts that are older than 2 days will be unlisted and not shown to their followers.
+ - User notification settings: Add `privacy_option` option.
 +- OAuth: admin scopes support (relevant setting: `[:auth, :enforce_oauth_admin_scope_usage]`).
  <details>
    <summary>API Changes</summary>