Merge branch 'develop-olympus' into develop-ascraeus

* develop-olympus:
  [ticket/12467] Add config*.php and tests_config*.php to .gitignore
This commit is contained in:
Andreas Fischer 2014-05-02 14:22:02 +02:00
commit 5e95815503

6
.gitignore vendored
View file

@ -5,9 +5,7 @@
/phpBB/cache/*.php /phpBB/cache/*.php
/phpBB/cache/*.lock /phpBB/cache/*.lock
/phpBB/composer.phar /phpBB/composer.phar
/phpBB/config.php /phpBB/config*.php
/phpBB/config_dev.php
/phpBB/config_test.php
/phpBB/ext/* /phpBB/ext/*
/phpBB/files/* /phpBB/files/*
/phpBB/images/avatars/gallery/* /phpBB/images/avatars/gallery/*
@ -15,5 +13,5 @@
/phpBB/store/* /phpBB/store/*
/phpBB/vendor /phpBB/vendor
/tests/phpbb_unit_tests.sqlite2 /tests/phpbb_unit_tests.sqlite2
/tests/test_config.php /tests/test_config*.php
/tests/tmp/* /tests/tmp/*