summaryrefslogtreecommitdiff
path: root/ext/intl/timezone/timezone_methods.cpp
diff options
context:
space:
mode:
authorMatteo Beccati <mbeccati@php.net>2015-06-12 00:27:31 +0200
committerMatteo Beccati <mbeccati@php.net>2015-06-12 00:27:31 +0200
commitcd5b7e968801ad2df0576cdc3273d2847590ad30 (patch)
treec2476789dd9eda896aff53f49f2c91816325ffc9 /ext/intl/timezone/timezone_methods.cpp
parent9692e74b04eacf7a46f65df8db3eef34e695dba9 (diff)
parentafa4c3e7c72a616d21780fd39764f7fc03d0a3df (diff)
downloadphp-git-cd5b7e968801ad2df0576cdc3273d2847590ad30.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote) Fixed bug #61574 - No MSI Conflicts: ext/pdo_pgsql/pgsql_driver.c win32/install.txt
Diffstat (limited to 'ext/intl/timezone/timezone_methods.cpp')
0 files changed, 0 insertions, 0 deletions