mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-08 09:46:46 +02:00
Merge branch 'ticket/igorw/9816' into develop-olympus
* ticket/igorw/9816: [ticket/9816] Remove config.php from repository Conflicts: .gitignore
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,4 +1,5 @@
|
|||||||
|
*~
|
||||||
phpBB/cache/*.php
|
phpBB/cache/*.php
|
||||||
|
phpBB/config.php
|
||||||
tests/phpbb_unit_tests.sqlite2
|
tests/phpbb_unit_tests.sqlite2
|
||||||
tests/test_config.php
|
tests/test_config.php
|
||||||
*~
|
|
||||||
|
Reference in New Issue
Block a user