resolved merge conflict

This commit is contained in:
fds2610 2026-01-05 14:50:45 +01:00
commit 45e43ea90d

4
.gitignore vendored
View file

@ -1,4 +1,6 @@
*.kdev4
html/config.php
.gitignore
info.php
config.php
*.old