php-phpbb

mirror of https://github.com/phpbb/phpbb.git synced 2025-05-23 15:59:49 +02:00

History

Joas Schilling 8c4670eeb1 Merge branch 'ticket/11568' into ticket/11568-develop

* ticket/11568:
  [ticket/11568] Split status code and html debug assertion into two methods
  [ticket/11568] Add comma at end of array key-value couple
  [ticket/11568] Invert logic for asserting the response
  [ticket/11568] Use static calls for static methods

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php

2013-05-31 16:45:06 +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

Merge remote-tracking branch 'upstream/develop' into ticket/11015

2012-12-06 21:49:24 -05:00

phpbb_database_test_connection_manager.php

Merge branch 'develop-olympus' into develop

2013-05-27 18:17:15 +02:00

phpbb_functional_test_case.php

Merge branch 'ticket/11568' into ticket/11568-develop