]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 24 Jun 2020 10:22:44 +0000 (12:22 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 24 Jun 2020 10:22:44 +0000 (12:22 +0200)
* PHP-7.4:
  Handle *0 / *1 more consistently

1  2 
ext/standard/crypt.c

Simple merge