aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid King <imkingdavid@gmail.com>2012-03-11 12:58:55 -0400
committerDavid King <imkingdavid@gmail.com>2012-03-11 12:58:55 -0400
commitb652e1a1bb31512fad1cf315f7c4d475141191f9 (patch)
tree53e3fbbc2fd8052c0c8249275243baac03767a63
parentaee79c6cdb75407ad36be03ac2fb0cc99e78c185 (diff)
parent24f1896b3c1591fd73eedd014dc6ebb214804f4d (diff)
downloadforums-b652e1a1bb31512fad1cf315f7c4d475141191f9.tar
forums-b652e1a1bb31512fad1cf315f7c4d475141191f9.tar.gz
forums-b652e1a1bb31512fad1cf315f7c4d475141191f9.tar.bz2
forums-b652e1a1bb31512fad1cf315f7c4d475141191f9.tar.xz
forums-b652e1a1bb31512fad1cf315f7c4d475141191f9.zip
Merge branch 'unknownbliss/ticket/10697' into develop-olympus
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 7d789c59a1..d875beb784 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,10 @@
*~
/phpunit.xml
+/phpBB/cache/*.html
/phpBB/cache/*.php
/phpBB/cache/queue.php.lock
/phpBB/config.php
+/phpBB/ext/*
/phpBB/files/*
/phpBB/images/avatars/gallery/*
/phpBB/images/avatars/upload/*