diff options
| author |   Joas Schilling <nickvergessen@gmx.de> | 2014-11-25 22:45:37 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-11-25 22:45:37 +0100 |
| commit | 74dfb56459fda73bbfe92f9527b5365e79d1f18d (patch) | |
| tree | f3a873043d1d47ee3f2607440488750bbfb14e15 /.gitignore | |
| parent | Merge branch 'develop-ascraeus' into develop (diff) | |
| parent | Merge pull request #3183 from Nicofuma/ticket/13362 (diff) | |
| download | phpbb-74dfb56459fda73bbfe92f9527b5365e79d1f18d.tar.gz phpbb-74dfb56459fda73bbfe92f9527b5365e79d1f18d.tar.bz2 phpbb-74dfb56459fda73bbfe92f9527b5365e79d1f18d.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 67e0563a19..1d25d0d796 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,8 @@ *~ /phpunit.xml -/phpBB/cache/twig/* -/phpBB/cache/*.html -/phpBB/cache/*.php -/phpBB/cache/*.lock +/phpBB/cache/* +!/phpBB/.htaccess +!/phpBB/index.html /phpBB/composer.phar /phpBB/config*.php /phpBB/ext/* |