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:
Andreas Fischer 2010-10-15 15:39:36 +02:00
commit b8f37a5024
2 changed files with 2 additions and 1 deletions

3
.gitignore vendored
View file

@ -1,4 +1,5 @@
*~
phpBB/cache/*.php
phpBB/config.php
tests/phpbb_unit_tests.sqlite2
tests/test_config.php
*~

View file