diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-05-02 14:22:02 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-05-02 14:22:02 +0200 |
| commit | 5e9581550350b6a1f47a0969ed7c5962eb206d90 (patch) | |
| tree | 10bb2970d29d05ca64c14ace4c9bb934dd1cad75 | |
| parent | 2a280513cac6d09a634775d37e6cda518e8b54d8 (diff) | |
| parent | 43c6fd768fa94b7befabeb71ae8e728ff84e731d (diff) | |
| download | forums-5e9581550350b6a1f47a0969ed7c5962eb206d90.tar forums-5e9581550350b6a1f47a0969ed7c5962eb206d90.tar.gz forums-5e9581550350b6a1f47a0969ed7c5962eb206d90.tar.bz2 forums-5e9581550350b6a1f47a0969ed7c5962eb206d90.tar.xz forums-5e9581550350b6a1f47a0969ed7c5962eb206d90.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/12467] Add config*.php and tests_config*.php to .gitignore
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 06b13923f5..25a6352f8d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,7 @@ /phpBB/cache/*.php /phpBB/cache/*.lock /phpBB/composer.phar -/phpBB/config.php -/phpBB/config_dev.php -/phpBB/config_test.php +/phpBB/config*.php /phpBB/ext/* /phpBB/files/* /phpBB/images/avatars/gallery/* @@ -15,5 +13,5 @@ /phpBB/store/* /phpBB/vendor /tests/phpbb_unit_tests.sqlite2 -/tests/test_config.php +/tests/test_config*.php /tests/tmp/* |