Merge remote-tracking branch 'origin/develop' into translate-posts

2024-12-30 18:17:50 +01:00 · 2024-12-30 18:17:50 +01:00 · d818a3d762
commit d818a3d762
parent 3ee8d0eeaf 138ead9856
166 changed files with 3161 additions and 1181 deletions
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@ -94,6 +94,7 @@ defmodule Pleroma.Application do
    children =
      [
        Pleroma.PromEx,
+        Pleroma.LDAP,
        Pleroma.Repo,
        Config.TransferTask,
        Pleroma.Emoji,