summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/odbc/odbc_driver.php
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-05-23 19:47:19 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-05-23 19:47:19 +0200
commitf777d3ddafcd2a79bbc65d329e1f9586c3a449fb (patch)
tree486b0084985afaa2b96753ed872b0b0c025e9452 /system/database/drivers/odbc/odbc_driver.php
parent13a9bf472f548463682d4d3fafce146b9a9ced3c (diff)
parente65f4893c9b3e7c2b34e0fef7c7de04112329063 (diff)
Fixed conflicts with 2.1-stable merge.
Diffstat (limited to 'system/database/drivers/odbc/odbc_driver.php')
0 files changed, 0 insertions, 0 deletions