]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 6 Jan 2020 09:43:05 +0000 (10:43 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 6 Jan 2020 09:43:05 +0000 (10:43 +0100)
* PHP-7.4:
  Don't link against openssl 1.1 in curl

1  2 
ext/curl/interface.c

Simple merge