summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/php_mysqlnd.c
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2016-12-30 13:56:34 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2016-12-30 13:56:34 +0100
commit97e16ebbe2976dad22e8238958d3d5f023cc0132 (patch)
treea3d6bbbddd11bf464abf7ac9bcb8984108307d9e /ext/mysqlnd/php_mysqlnd.c
parent88d1a2c5aab441fd322683f8d21667932aeec636 (diff)
parent432660f73f929b560d5f9c3d5466e3a2aee42851 (diff)
downloadphp-git-97e16ebbe2976dad22e8238958d3d5f023cc0132.tar.gz
Merge branch 'PHP-7.0' of https://git.php.net/repository/php-src into PHP-7.0
* 'PHP-7.0' of https://git.php.net/repository/php-src: Another try at making concat_003 more reliable Fix flaky openssl_pkey_new test Make Opcache tests using the cli server more reliable
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions