Merge branch 'develop' into issue/1383

diff --cc config/config.exs
index a737c98af40ed30941c184d34d7e696be88636d8,5839cbe4a6a1b5d8962c43061d30e23f9b1b6ebb..bbd8f7d781d4088229ab55d954e1b5d09c84975d
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -609,6 -621,9 +611,8 @@@ config :pleroma, :web_cache_ttl
    activity_pub: nil,
    activity_pub_question: 30_000
  
 -config :swarm, node_blacklist: [~r/myhtml_.*$/]
+ config :pleroma, :modules, runtime_dir: "instance/modules"
+ 
  # 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 config/test.exs
Simple merge

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

diff --cc lib/pleroma/application.ex
Simple merge