php-phpbb/.gitignore

*~
/phpunit.xml
/phpBB/cache/*.html
/phpBB/cache/*.php
/phpBB/cache/queue.php.lock
/phpBB/config.php
/phpBB/ext/*
/phpBB/files/*
/phpBB/images/avatars/gallery/*
/phpBB/images/avatars/upload/*
/phpBB/store/*
/tests/phpbb_unit_tests.sqlite2
/tests/test_config.php
/tests/tmp/*
Merge branch 'ticket/igorw/9816' into develop-olympus * ticket/igorw/9816: [ticket/9816] Remove config.php from repository Conflicts: .gitignore 2010-10-15 15:39:36 +02:00			`*~`
[ticket/10255] Add leading slash in gitignore to only ignore specified files PHPBB3-10255 2011-07-14 02:33:32 +02:00			`/phpunit.xml`
[ticket/10697] Updating gitignore to match develop branch PHPBB3-10697 2012-03-11 09:42:56 +00:00			`/phpBB/cache/*.html`
[ticket/10255] Add leading slash in gitignore to only ignore specified files PHPBB3-10255 2011-07-14 02:33:32 +02:00			`/phpBB/cache/*.php`
			`/phpBB/cache/queue.php.lock`
			`/phpBB/config.php`
[ticket/10697] Updating gitignore to match develop branch PHPBB3-10697 2012-03-11 09:42:56 +00:00			`/phpBB/ext/*`
[ticket/10255] Add leading slash in gitignore to only ignore specified files PHPBB3-10255 2011-07-14 02:33:32 +02:00			`/phpBB/files/*`
			`/phpBB/images/avatars/gallery/*`
			`/phpBB/images/avatars/upload/*`
			`/phpBB/store/*`
			`/tests/phpbb_unit_tests.sqlite2`
			`/tests/test_config.php`
[ticket/10309] Update .gitignore and move .gitkeep. PHPBB3-10309 2011-08-20 14:34:02 -04:00			`/tests/tmp/*`