aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2012-03-30 11:15:54 -0700
committerIgor Wiedler <igor@wiedler.ch>2012-03-30 11:15:54 -0700
commit313cf7297cb8d7b766d34ab1e2c65445d0c6379d (patch)
tree79822ecc276f4a81dc9fe243a09c39cd53fbea1e /.gitignore
parentMerge branch 'unknownbliss/feature/events-dispatcher-olympus' into develop-ol... (diff)
parent[feature/event-dispatcher] Adding composer.phar to .gitignore for olympus (diff)
downloadphpbb-313cf7297cb8d7b766d34ab1e2c65445d0c6379d.tar.gz
phpbb-313cf7297cb8d7b766d34ab1e2c65445d0c6379d.tar.bz2
phpbb-313cf7297cb8d7b766d34ab1e2c65445d0c6379d.zip
Merge pull request #668 from unknownbliss/feature/events-dispatcher-olympus
Feature/events dispatcher olympus
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 965c2d4f00..4093aeb56d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
/phpBB/cache/*.html
/phpBB/cache/*.php
/phpBB/cache/queue.php.lock
+/phpBB/composer.phar
/phpBB/config.php
/phpBB/config_dev.php
/phpBB/config_test.php