]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ced675d 05033c9)
Merge branch 'PHP-5.6' into PHP-7.0
authorJakub Zelenka <bukka@php.net>
Wed, 8 Jun 2016 17:36:36 +0000 (18:36 +0100)
committerJakub Zelenka <bukka@php.net>
Wed, 8 Jun 2016 17:36:36 +0000 (18:36 +0100)
1  2 
ext/openssl/openssl.c patch | diff1 | diff2 | blob | history

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