]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 18 Jun 2020 12:22:29 +0000 (14:22 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 18 Jun 2020 12:22:29 +0000 (14:22 +0200)
1  2 
ext/openssl/xp_ssl.c

Simple merge