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

diff --cc config/config.exs
Simple merge

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

diff --cc lib/pleroma/web/activity_pub/publisher.ex
Simple merge