Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10732] Add config_dev.php and config_test.php to .gitignore
This commit is contained in:
Igor Wiedler 2012-03-28 23:39:16 +02:00
commit 9be55ba771

2
.gitignore vendored
View file

@ -4,6 +4,8 @@
/phpBB/cache/*.php /phpBB/cache/*.php
/phpBB/cache/queue.php.lock /phpBB/cache/queue.php.lock
/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/*