From: minibikini <egor@kislitsyn.com>
Date: Tue, 10 Dec 2019 13:38:25 +0000 (+0000)
Subject: Merge branch 'develop' into 'feature/custom-runtime-modules'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=43d9c06a2ad3e97b671f4580465def1474855d2f;p=akkoma

Merge branch 'develop' into 'feature/custom-runtime-modules'

# Conflicts:
#   CHANGELOG.md
---

43d9c06a2ad3e97b671f4580465def1474855d2f
diff --cc CHANGELOG.md
index 5528845d6,4b1fdcdce..20b8de887
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -49,7 -50,7 +50,8 @@@ The format is based on [Keep a Changelo
  - 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.
 +- Support for custom Elixir modules (such as MRF policies)
+ - User settings: Add _This account is a_ option.
  <details>
    <summary>API Changes</summary>