Merge remote-tracking branch 'origin/staging' into feature/fts-xapian

2022-10-07 17:06:12 +02:00
parent 59a4031e24 0d7fe2e347
commit 60871fa7d0
74 changed files with 1084 additions and 618 deletions
--- a/data/Dockerfiles/dovecot/docker-entrypoint.sh
+++ b/data/Dockerfiles/dovecot/docker-entrypoint.sh
@@ -309,6 +309,7 @@ namespace {
 }
 EOF

+
 cat <<EOF > /etc/dovecot/sogo_trusted_ip.conf
 # Autogenerated by mailcow
 remote ${IPV4_NETWORK}.248 {