]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4' into PHP-8.0
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 30 Nov 2020 14:17:27 +0000 (15:17 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 30 Nov 2020 14:17:27 +0000 (15:17 +0100)
* PHP-7.4:
  Next attempt to fix bug #80368

1  2 
ext/openssl/openssl.c

Simple merge