phpbb/tests/test_framework
Nils Adermann 1d388d98ab Merge remote-tracking branch 'github-phpbb/develop-olympus' into HEAD
* github-phpbb/develop-olympus:
  [ticket/11159] static public is the currently approved order.

Conflicts:
	tests/dbal/select_test.php
	tests/dbal/write_test.php
	tests/request/request_var_test.php
	tests/security/extract_current_page_test.php
	tests/security/redirect_test.php
	tests/template/template_test.php
	tests/text_processing/make_clickable_test.php
	tests/utf/utf8_clean_string_test.php
2012-11-06 20:02:40 +01: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/11159] static public is the currently approved order. 2012-11-06 10:41:06 -05:00
phpbb_database_test_connection_manager.php Merge remote-tracking branch 'github-noxwizard/ticket/10678' into develop-olympus 2012-07-17 21:12:47 +02:00
phpbb_functional_test_case.php Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10631 2012-09-01 21:15:39 +01:00
phpbb_test_case.php [ticket/9916] Updating License in the header 2012-01-02 16:18:32 +00:00
phpbb_test_case_helpers.php [ticket/10631] Functional acp_extensions test, cleanup 2012-09-01 15:05:49 +01:00