makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/10255] Add leading slash in gitignore to only ignore specified files

Conflicts:
	.gitignore
This commit is contained in:
Andreas Fischer 2011-07-14 03:20:55 +02:00
commit d16525e176
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
.gitignore vendored
View file

@ -1,13 +1,13 @@
*~ *~
phpunit.xml /phpunit.xml
phpBB/cache/*.php /phpBB/cache/*.php
phpBB/cache/queue.php.lock /phpBB/cache/queue.php.lock
phpBB/config.php /phpBB/config.php
phpBB/files/* /phpBB/files/*
phpBB/images/avatars/gallery/* /phpBB/images/avatars/gallery/*
phpBB/images/avatars/upload/* /phpBB/images/avatars/upload/*
phpBB/store/* /phpBB/store/*
tests/phpbb_unit_tests.sqlite2 /tests/phpbb_unit_tests.sqlite2
tests/test_config.php /tests/test_config.php
tests/tmp /tests/tmp
tests/utf/data/*.txt /tests/utf/data/*.txt