diff options
| author |   Andreas Fischer <bantu@phpbb.com> | 2010-10-15 15:39:36 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-10-15 15:39:36 +0200 |
| commit | b8f37a5024c3fbda51c76f3990e6dd2059892837 (patch) | |
| tree | 388c904843049ea0afbb2577c686fff1d25fbf50 /.gitignore | |
| parent | Merge branch 'ticket/igorw/9830' into develop-olympus (diff) | |
| parent | [ticket/9816] Remove config.php from repository (diff) | |
| download | phpbb-b8f37a5024c3fbda51c76f3990e6dd2059892837.tar.gz phpbb-b8f37a5024c3fbda51c76f3990e6dd2059892837.tar.bz2 phpbb-b8f37a5024c3fbda51c76f3990e6dd2059892837.zip | |
Merge branch 'ticket/igorw/9816' into develop-olympus
* ticket/igorw/9816:
[ticket/9816] Remove config.php from repository
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 2b9eef7fce..b825007244 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ +*~ phpBB/cache/*.php +phpBB/config.php tests/phpbb_unit_tests.sqlite2 tests/test_config.php -*~ |