diff options
author | Joe Watkins <krakjoe@php.net> | 2017-01-04 13:35:01 +0000 |
---|---|---|
committer | Joe Watkins <krakjoe@php.net> | 2017-01-04 13:36:04 +0000 |
commit | 6c9164047e7b5c1879d7d43d36622aec8e83d7aa (patch) | |
tree | 3bc261ac9092ca1e37258edfb939a1b38d018d10 /ext/mysqlnd/mysqlnd_plugin.c | |
parent | b15cc7913a1aa108b3e27c8c361202785bea4033 (diff) | |
parent | 63d116e5711e995f201ba6411bcb3929e5cbf041 (diff) | |
download | php-git-6c9164047e7b5c1879d7d43d36622aec8e83d7aa.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
get_defined_functions additional parameter to exclude disabled functions
news entry for PR #1312
Diffstat (limited to 'ext/mysqlnd/mysqlnd_plugin.c')
0 files changed, 0 insertions, 0 deletions