]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.2' into PHP-7.3
authorAnatol Belski <ab@php.net>
Tue, 4 Sep 2018 08:57:25 +0000 (10:57 +0200)
committerAnatol Belski <ab@php.net>
Tue, 4 Sep 2018 08:57:25 +0000 (10:57 +0200)
commit7d8e6e6394725a0c00ddfb0bc1a14ded4d94b962
tree5337c50adf7999f1e1ae86567b1d77d877d523f7
parentd36230fcaba46cc5b3ad54ced9337eee404c6b1b
parent2476fb76a75cf71b2d27070f1daeeb1ea4058096
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed bug #76833, backport change to stream_socket_enable_crypto-win32.phpt from 7.3