Merge remote-tracking branch 'origin/staging' into nightly

2024-11-12 15:10:03 +01:00
parent f9304dcd9b dc5a28111d
commit 9542698e95
205 changed files with 7559 additions and 3663 deletions
@@ -46,6 +46,7 @@ data/conf/sogo/custom-theme.js
 data/conf/sogo/plist_ldap
 data/conf/sogo/plist_ldap.sh
 data/conf/sogo/sieve.creds
+data/conf/sogo/cron.creds
 data/conf/sogo/sogo-full.svg
 data/gitea/
 data/gogs/