Merge branch 'unknownbliss/feature/events-dispatcher-olympus' into develop-olympus

This commit is contained in:
David King 2012-03-30 13:38:40 -04:00
commit dc4d0677b9

1
.gitignore vendored
View file

@ -11,6 +11,7 @@
/phpBB/images/avatars/gallery/* /phpBB/images/avatars/gallery/*
/phpBB/images/avatars/upload/* /phpBB/images/avatars/upload/*
/phpBB/store/* /phpBB/store/*
/phpBB/vendor
/tests/phpbb_unit_tests.sqlite2 /tests/phpbb_unit_tests.sqlite2
/tests/test_config.php /tests/test_config.php
/tests/tmp/* /tests/tmp/*