]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorJakub Zelenka <bukka@php.net>
Sun, 23 Oct 2016 18:56:29 +0000 (19:56 +0100)
committerJakub Zelenka <bukka@php.net>
Sun, 23 Oct 2016 18:56:29 +0000 (19:56 +0100)
1  2 
ext/openssl/openssl.c

Simple merge