]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorAnatol Belski <ab@php.net>
Wed, 13 Sep 2017 12:12:31 +0000 (14:12 +0200)
committerAnatol Belski <ab@php.net>
Wed, 13 Sep 2017 12:12:31 +0000 (14:12 +0200)
* PHP-7.1:
  Fixed bug #75018, fixed bug #75177

1  2 
ext/mysqlnd/mysqlnd_wireprotocol.c

Simple merge