Fix merge conflicts

This commit is contained in:
Ruben Solvang 2026-01-17 01:04:57 +01:00
commit e49aaa108f
92 changed files with 4125 additions and 580 deletions

6
.gitignore vendored
View file

@ -1,4 +1,8 @@
app*
content/robots.txt
custom/smtp-config.php*
custom/smtp-config.php
content/.htaccess
.claude
custom/data/**/*.csv
custom/listmonk-config.php
content/error_log