diff options
author | Andreas Fischer <bantu@phpbb.com> | 2010-11-03 11:58:48 +0100 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2010-11-03 11:58:48 +0100 |
commit | f164906d77d3c8cb5650bb1e70db8e233f726d4c (patch) | |
tree | cb403f103373dfeb833a737615dbd8ed09aa30c7 /phpBB/includes/diff | |
parent | 36820a4f4f099b20d83044416ec208c7a4cbf63c (diff) | |
parent | e3b460a518e46ad910345199ee85e94d3134fd3e (diff) | |
download | forums-f164906d77d3c8cb5650bb1e70db8e233f726d4c.tar forums-f164906d77d3c8cb5650bb1e70db8e233f726d4c.tar.gz forums-f164906d77d3c8cb5650bb1e70db8e233f726d4c.tar.bz2 forums-f164906d77d3c8cb5650bb1e70db8e233f726d4c.tar.xz forums-f164906d77d3c8cb5650bb1e70db8e233f726d4c.zip |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[task/mssql-db-tests] Remove MS SQL helper values from SELECT LIMIT results.
[task/mssql-db-tests] Split up database tests into SELECT and write operations
[task/mssql-db-tests] PHPUnit output got stuck after unterminated ob_start.
[task/mssql-db-tests] sql_query_limit must return all results when total = 0
[task/mssql-db-tests] Add support for odbc & sqlsrv PDO test connections
[task/mssql-db-tests] Refactored getConnection into multiple smaller parts.
[task/mssql-db-tests] Allow test configuration with environment variables.
[task/mssql-db-tests] No longer display an error when skipping db tests.
[task/mssql-db-tests] Use a simple getter for test case helpers.
Conflicts:
tests/template/template.php
Diffstat (limited to 'phpBB/includes/diff')
0 files changed, 0 insertions, 0 deletions