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 | |
| parent | 7ac8838b69b804e29f4e4751680424239f62e40d (diff) | |
| parent | 20505ff326e98cdab6c09adc4fa554dae4221aeb (diff) | |
| download | forums-b8f37a5024c3fbda51c76f3990e6dd2059892837.tar forums-b8f37a5024c3fbda51c76f3990e6dd2059892837.tar.gz forums-b8f37a5024c3fbda51c76f3990e6dd2059892837.tar.bz2 forums-b8f37a5024c3fbda51c76f3990e6dd2059892837.tar.xz forums-b8f37a5024c3fbda51c76f3990e6dd2059892837.zip | |
Merge branch 'ticket/igorw/9816' into develop-olympus
* ticket/igorw/9816:
[ticket/9816] Remove config.php from repository
Conflicts:
.gitignore
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | phpBB/config.php | 0 |
2 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 -*~ diff --git a/phpBB/config.php b/phpBB/config.php deleted file mode 100644 index e69de29bb2..0000000000 --- a/phpBB/config.php +++ /dev/null |