Resolved conflicts by taking development (v2.6.0) version for all files. Removed statistics.twig (replaced by Statistics plugin).
52 lines
781 B
Plaintext
52 lines
781 B
Plaintext
# Dependencies
|
|
node_modules/
|
|
package-lock.json
|
|
|
|
# Build outputs
|
|
*.log
|
|
.DS_Store
|
|
Thumbs.db
|
|
|
|
# IDE files
|
|
.vscode/
|
|
.idea/
|
|
*.swp
|
|
*.swo
|
|
|
|
# Cache & Storage
|
|
.cache/
|
|
.sass-cache/
|
|
admin/storage/cache/
|
|
admin/storage/geoip/
|
|
admin/storage/stats.json
|
|
var/
|
|
|
|
# Runtime-compiled theme assets (generated by scssphp, read-only)
|
|
themes/*/assets/css_compiled/
|
|
|
|
# Runtime-compiled theme assets
|
|
public/themes/
|
|
|
|
# Temporary files
|
|
*.tmp
|
|
*.temp
|
|
.bak/
|
|
|
|
# Local configuration & credentials
|
|
config.json
|
|
config.*.json
|
|
!config.json.example
|
|
admin/config/admin.json
|
|
|
|
# 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
|