diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-12-08 03:08:21 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-12-08 03:08:21 +0100 |
| commit | b7b8fefdd084b51c93b15dfdfb34d2ef294f4d76 (patch) | |
| tree | ea97afaa481306dbb0a111490b9443f80de56a29 /phpBB/docs/stylesheet.css | |
| parent | ebc15a8b6cb62e29371cb02d6421ea46e47a4020 (diff) | |
| parent | b5f94a14f1a5c77366f824780f1120a1b5e9184a (diff) | |
| download | forums-b7b8fefdd084b51c93b15dfdfb34d2ef294f4d76.tar forums-b7b8fefdd084b51c93b15dfdfb34d2ef294f4d76.tar.gz forums-b7b8fefdd084b51c93b15dfdfb34d2ef294f4d76.tar.bz2 forums-b7b8fefdd084b51c93b15dfdfb34d2ef294f4d76.tar.xz forums-b7b8fefdd084b51c93b15dfdfb34d2ef294f4d76.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10205] Reduce nesting in mysql drivers.
[ticket/10205] Rewrite _sql_error implementations to have a single return.
[ticket/10205] Cosmetic changes.
[ticket/10205] Add some columns to the empty fixture file for mssqlnative.
[ticket/10205] Delete stray return.
[ticket/10205] Test failed connection attempts.
[ticket/10205] Check for function existence in mssql connect method.
[ticket/10205] Convert mssqlnative driver to the same logic.
[ticket/10205] Fix a parse error in oracle driver.
[ticket/10205] Fix remaining db drivers.
[ticket/10205] Avoid calling mysqli functions when mysqli is missing.
[ticket/10205] Account for potentially missing extensions in dbal.
Conflicts:
tests/fixtures/empty.xml
Diffstat (limited to 'phpBB/docs/stylesheet.css')
0 files changed, 0 insertions, 0 deletions