]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Thu, 6 Oct 2016 09:03:09 +0000 (11:03 +0200)
committerAnatol Belski <ab@php.net>
Thu, 6 Oct 2016 09:03:09 +0000 (11:03 +0200)
* PHP-7.0:
  fix datatype

1  2 
main/streams/streams.c

Simple merge