Marc Alexander 7006db7a2d Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords ...

Conflicts:
	phpBB/includes/functions.php

2013-10-03 10:04:59 +02:00

..

phpbb_database_connection_odbc_pdo_wrapper.php

Merge remote-tracking branch 'github-noxwizard/ticket/10678' into develop-olympus

2012-07-17 21:12:47 +02:00

phpbb_database_test_case.php

[ticket/11700] travis has hardcoded driver class names without namespaces

2013-09-16 04:01:18 +02:00

phpbb_database_test_connection_manager.php

Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700

2013-09-16 01:24:05 +02:00

phpbb_functional_test_case.php

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords

2013-10-03 10:04:59 +02:00

phpbb_search_test_case.php

[ticket/11700] Use underscores for generated search test wrappers

2013-09-16 00:39:36 +02:00

phpbb_session_test_case.php

[ticket/11620] Whitespace and combine function into test_case

2013-07-22 17:39:45 -07:00

phpbb_test_case_helpers.php

[ticket/11700] Default db driver for tests must not lead with \

2013-09-16 04:07:30 +02:00

phpbb_test_case.php

Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework"

2013-09-10 10:06:13 -05:00