Merge development v2.6.0 into main

Resolved conflicts by taking development (v2.6.0) version for all files.
Removed statistics.twig (replaced by Statistics plugin).
This commit is contained in:
2026-08-15 19:32:47 +02:00
207 changed files with 3736 additions and 23879 deletions
+12 -1
View File
@@ -30,11 +30,22 @@ public/themes/
# Temporary files
*.tmp
*.temp
.bak/
# Local configuration & credentials
config.json
config.*.json
!config.json.example
admin/config/admin.json
# No content
# No content (per-domain content dirs included)
content/
content-*/
!content/.gitkeep
# Test results
pentest_results.*
accessibility-test-results.*
enhanced-test-results.*
cli/test/functional/test-report*.md
cli/test/functional/function-test.md