Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12706] Ignore additional rank images
  [ticket/12706] Ignore additional languages
  [ticket/12706] Ignore additional styles
This commit is contained in:
Andreas Fischer 2014-06-14 12:44:37 +02:00
commit 8df53d7932

6
.gitignore vendored
View file

@ -10,7 +10,13 @@
/phpBB/files/*
/phpBB/images/avatars/gallery/*
/phpBB/images/avatars/upload/*
/phpBB/images/ranks/*
/phpBB/language/*
!/phpBB/language/en
/phpBB/store/*
/phpBB/styles/*
!/phpBB/styles/prosilver
!/phpBB/styles/subsilver2
/phpBB/vendor
/tests/phpbb_unit_tests.sqlite*
/tests/test_config*.php