Fix merge conflicts
This commit is contained in:
commit
e49aaa108f
92 changed files with 4125 additions and 580 deletions
6
.gitignore
vendored
6
.gitignore
vendored
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue