summaryrefslogtreecommitdiff
path: root/drivers/adodb-pdo_mysql.inc.php
diff options
context:
space:
mode:
authorDamien Regad <dregad@mantisbt.org>2018-03-30 18:47:26 +0200
committerDamien Regad <dregad@mantisbt.org>2018-03-30 18:47:26 +0200
commitbd898bf510431e2f8bce2469d188821e200af29f (patch)
treec0b49b1f62e2c396bdd91ea09116f03cf344f70b /drivers/adodb-pdo_mysql.inc.php
parent62ebb04b157467f4e650ef0e7a02120a2b41c169 (diff)
parentd29c23f2264ec95c6d3851e0f51ce240b2f36b74 (diff)
downloadadodb-bd898bf510431e2f8bce2469d188821e200af29f.tar.gz
adodb-bd898bf510431e2f8bce2469d188821e200af29f.tar.bz2
adodb-bd898bf510431e2f8bce2469d188821e200af29f.zip
Merge branch 'hotfix/5.20'
I messed up the merge at c350c007ed585a4da4dc8c62ae7954cfe13b621f. Not sure what I did or how, but the changes from the hotfix branch got lost. Redoing the merge to fix the problem.
Diffstat (limited to 'drivers/adodb-pdo_mysql.inc.php')
0 files changed, 0 insertions, 0 deletions