]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad38168 1310234)
Merge branch 'PHP-7.2'
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 17 Nov 2017 21:26:04 +0000 (22:26 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 17 Nov 2017 21:26:04 +0000 (22:26 +0100)
1  2 
ext/standard/dns.c patch | diff1 | diff2 | blob | history

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