]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorRemi Collet <remi@php.net>
Tue, 8 Jan 2019 08:34:05 +0000 (09:34 +0100)
committerRemi Collet <remi@php.net>
Tue, 8 Jan 2019 08:34:05 +0000 (09:34 +0100)
* PHP-7.2:
  cleanup merge

1  2 
ext/mbstring/oniguruma/src/regparse.c

Simple merge