Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index

diff --cc config/config.exs
index 42e4cb4ce319fb12c4e348bc0a852c04dc2c5e4d,61e2648a983e70da686da47bb0e24ba2cade90bb..e82f08e076bfcfbe6adb3f3ad06b06b648b8a281
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -476,8 -465,9 +465,11 @@@ config :pleroma, :oauth2
    token_expires_in: 600,
    issue_new_refresh_token: true
  
 +config :pleroma, :database, rum_enabled: false
 +
+ config :http_signatures,
+   adapter: Pleroma.Signature
+ 
  # Import environment specific config. This must remain at the bottom
  # of this file so it overrides the configuration defined above.
  import_config "#{Mix.env()}.exs"

diff --cc docs/config.md
Simple merge

diff --cc lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge