diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-06-14 12:44:37 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-06-14 12:44:37 +0200 |
| commit | 8df53d79328bac386bef3f2969a3c3c7b9fc52b4 (patch) | |
| tree | 4eac6bbeab772e2eecde73226846a3e65939294b | |
| parent | 72e64fec6eb886eb32408f613a485527b2c15ae4 (diff) | |
| parent | a4c75d89706ef7a678c8914b374adcf323226913 (diff) | |
| download | forums-8df53d79328bac386bef3f2969a3c3c7b9fc52b4.tar forums-8df53d79328bac386bef3f2969a3c3c7b9fc52b4.tar.gz forums-8df53d79328bac386bef3f2969a3c3c7b9fc52b4.tar.bz2 forums-8df53d79328bac386bef3f2969a3c3c7b9fc52b4.tar.xz forums-8df53d79328bac386bef3f2969a3c3c7b9fc52b4.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12706] Ignore additional rank images
[ticket/12706] Ignore additional languages
[ticket/12706] Ignore additional styles
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 18f598cf67..de503c10ad 100644 --- a/.gitignore +++ b/.gitignore @@ -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 |