]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 21 Jun 2019 13:07:59 +0000 (15:07 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 21 Jun 2019 13:07:59 +0000 (15:07 +0200)
1  2 
ext/openssl/openssl.c
ext/openssl/xp_ssl.c

Simple merge
Simple merge