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

diff --cc CHANGELOG.md
index 6564cf40ac799dd8716b236cb239118cd1ea0a94,89044d0462ce3047af98c21a604a18d99b7fd762..5528845d64df15bfc180c347419010398ce0ddbd
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -45,7 -48,7 +48,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.
 +- Support for custom Elixir modules (such as MRF policies)
  <details>
    <summary>API Changes</summary>
  

diff --cc config/config.exs
Simple merge

diff --cc docs/configuration/cheatsheet.md
Simple merge

diff --cc lib/pleroma/application.ex
index f47cb0ce97e4f495c2300b74712e640b65f24823,5b844aa413d03ba124bdd3bb591a406459164aef..2ae052069da301d0032579b6a282f5bd7e40d5e9
--- 1/lib/pleroma/application.ex
--- 2/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@@ -31,9 -30,9 +31,10 @@@ defmodule Pleroma.Application d
    # See http://elixir-lang.org/docs/stable/elixir/Application.html
    # for more information on OTP Applications
    def start(_type, _args) do
+     Pleroma.HTML.compile_scrubbers()
      Pleroma.Config.DeprecationWarnings.warn()
      setup_instrumenters()
 +    load_custom_modules()
  
      # Define workers and child supervisors to be supervised
      children =

diff --cc lib/pleroma/web/endpoint.ex
index 5fcce7ca24fbd204cafde794a65a4f50258def42,bbea31682c1f6533eb95f53011774df6f6c8f0cc..d32c38a05fb4b07c7fdaebc6dc86a2e2d3440706
--- 1/lib/pleroma/web/endpoint.ex
--- 2/lib/pleroma/web/endpoint.ex
+++ b/lib/pleroma/web/endpoint.ex
@@@ -59,16 -59,9 +59,9 @@@ defmodule Pleroma.Web.Endpoint d
  
    plug(Pleroma.Plugs.TrailingFormatPlug)
    plug(Plug.RequestId)
 -  plug(Plug.Logger)
 +  plug(Plug.Logger, log: :debug)
  
-   plug(
-     Plug.Parsers,
-     parsers: [:urlencoded, :multipart, :json],
-     pass: ["*/*"],
-     json_decoder: Jason,
-     length: Pleroma.Config.get([:instance, :upload_limit]),
-     body_reader: {Pleroma.Web.Plugs.DigestPlug, :read_body, []}
-   )
+   plug(Pleroma.Plugs.Parsers)
  
    plug(Plug.MethodOverride)
    plug(Plug.Head)