]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorJakub Zelenka <bukka@php.net>
Sun, 25 Jun 2017 17:11:10 +0000 (18:11 +0100)
committerJakub Zelenka <bukka@php.net>
Sun, 25 Jun 2017 17:11:10 +0000 (18:11 +0100)
1  2 
ext/openssl/openssl.c
ext/openssl/php_openssl.h

Simple merge
Simple merge