]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c98955 42952a7)
Merge branch 'PHP-7.1' into PHP-7.2
authorJohannes Schlüter <johannes@php.net>
Tue, 20 Feb 2018 22:32:25 +0000 (23:32 +0100)
committerJohannes Schlüter <johannes@php.net>
Tue, 20 Feb 2018 22:32:25 +0000 (23:32 +0100)
1  2 
ext/mysqlnd/mysqlnd_vio.c patch | diff1 | diff2 | blob | history

diff --cc ext/mysqlnd/mysqlnd_vio.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.