]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorJakub Zelenka <bukka@php.net>
Fri, 18 May 2018 16:25:06 +0000 (17:25 +0100)
committerJakub Zelenka <bukka@php.net>
Fri, 18 May 2018 16:25:06 +0000 (17:25 +0100)
1  2 
ext/openssl/openssl.c

Simple merge