]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorPeter Kokot <peterkokot@gmail.com>
Mon, 15 Jul 2019 16:15:58 +0000 (18:15 +0200)
committerPeter Kokot <peterkokot@gmail.com>
Mon, 15 Jul 2019 16:15:58 +0000 (18:15 +0200)
* PHP-7.4:
  Small typo and proto name fix

1  2 
ext/mysqli/mysqli_api.c
main/main.c

Simple merge
diff --cc main/main.c
Simple merge