diff options
author | Igor Wiedler <igor@wiedler.ch> | 2012-03-28 23:39:16 +0200 |
---|---|---|
committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-28 23:39:16 +0200 |
commit | 9be55ba771f801e5655200c11da1b9ca98afcb91 (patch) | |
tree | 6969887a3131061b58263f3776906818990269f5 | |
parent | 7258794be31a374c360f916952fefe6d22c80e87 (diff) | |
parent | a820ff1ebcc91f7caece6cd64b58cec1fc6d891e (diff) | |
download | forums-9be55ba771f801e5655200c11da1b9ca98afcb91.tar forums-9be55ba771f801e5655200c11da1b9ca98afcb91.tar.gz forums-9be55ba771f801e5655200c11da1b9ca98afcb91.tar.bz2 forums-9be55ba771f801e5655200c11da1b9ca98afcb91.tar.xz forums-9be55ba771f801e5655200c11da1b9ca98afcb91.zip |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10732] Add config_dev.php and config_test.php to .gitignore
-rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index d875beb784..e6e017f85e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ /phpBB/cache/*.php /phpBB/cache/queue.php.lock /phpBB/config.php +/phpBB/config_dev.php +/phpBB/config_test.php /phpBB/ext/* /phpBB/files/* /phpBB/images/avatars/gallery/* |