]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorJoe Watkins <krakjoe@php.net>
Tue, 4 Jun 2019 06:23:50 +0000 (08:23 +0200)
committerJoe Watkins <krakjoe@php.net>
Tue, 4 Jun 2019 06:23:50 +0000 (08:23 +0200)
* PHP-7.4:
  should be or


Trivial merge