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

diff --cc CHANGELOG.md
index e2249f897d9c3adaf87dd50d368e5b8078666dc8,c133cd9ec4f3335f9132c025f5822bb457ffe7c7..22f199b3d14f4614b3e8f79f8e8ae459dcd604fd
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -51,8 -51,8 +52,9 @@@ 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.
+ - OAuth: admin scopes support (relevant setting: `[:auth, :enforce_oauth_admin_scope_usage]`).
  <details>
    <summary>API Changes</summary>
  

diff --cc config/config.exs
Simple merge

diff --cc config/test.exs
index 8b9bf5c773f40535a65c7dab188efbb41ddad111,b48b89c8fffd5a2e980f424146970cfde526b7ec..6f6ab733e8ea8ffe39dfb0cf99a8bcb461be0be9
--- 1/config/test.exs
--- 2/config/test.exs
+++ b/config/test.exs
@@@ -93,8 -95,8 +95,10 @@@ config :joken, default_signer: "yU8uHKq
  
  config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
  
 +config :pleroma, :modules, runtime_dir: "test/fixtures/modules"
 +
+ config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
+ 
  if File.exists?("./config/test.secret.exs") do
    import_config "test.secret.exs"
  else

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