]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db95bd5 3a739c9)
Merge branch 'PHP-7.0' into PHP-7.1
authorJakub Zelenka <bukka@php.net>
Tue, 13 Sep 2016 17:27:55 +0000 (18:27 +0100)
committerJakub Zelenka <bukka@php.net>
Tue, 13 Sep 2016 17:27:55 +0000 (18:27 +0100)
1  2 
ext/openssl/xp_ssl.c patch | diff1 | diff2 | blob | history

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