a8dc2e65f4
# Conflicts: # .gitignore # .htconfig.php # .htconfig.php-dist # boot.php # include/dba.php # mod/health.php # util/htconfig.vagrant.php
8 lines
81 B
Plaintext
8 lines
81 B
Plaintext
*.out
|
|
.htconfig.php
|
|
#*
|
|
favicon.*
|
|
tests/coverage.html
|
|
/vendor
|
|
/nbproject/private/
|