diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-07-14 03:20:55 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-07-14 03:20:55 +0200 |
| commit | d16525e176dc01e7aabad1e59d84ae8a08122dd5 (patch) | |
| tree | 96b399c011637a150f5e16f51e8ea8f4d769f7d9 | |
| parent | 10384f217985dd52e9d088dafcfd65deb8648b76 (diff) | |
| parent | 4b2ff05a3b4467390a206bb56d0dcfcc39256e86 (diff) | |
| download | forums-d16525e176dc01e7aabad1e59d84ae8a08122dd5.tar forums-d16525e176dc01e7aabad1e59d84ae8a08122dd5.tar.gz forums-d16525e176dc01e7aabad1e59d84ae8a08122dd5.tar.bz2 forums-d16525e176dc01e7aabad1e59d84ae8a08122dd5.tar.xz forums-d16525e176dc01e7aabad1e59d84ae8a08122dd5.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10255] Add leading slash in gitignore to only ignore specified files
Conflicts:
.gitignore
| -rw-r--r-- | .gitignore | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore index 16dba4ad47..145a050aaa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,13 @@ *~ -phpunit.xml -phpBB/cache/*.php -phpBB/cache/queue.php.lock -phpBB/config.php -phpBB/files/* -phpBB/images/avatars/gallery/* -phpBB/images/avatars/upload/* -phpBB/store/* -tests/phpbb_unit_tests.sqlite2 -tests/test_config.php -tests/tmp -tests/utf/data/*.txt +/phpunit.xml +/phpBB/cache/*.php +/phpBB/cache/queue.php.lock +/phpBB/config.php +/phpBB/files/* +/phpBB/images/avatars/gallery/* +/phpBB/images/avatars/upload/* +/phpBB/store/* +/tests/phpbb_unit_tests.sqlite2 +/tests/test_config.php +/tests/tmp +/tests/utf/data/*.txt |