]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Fri, 23 Jun 2017 06:53:12 +0000 (07:53 +0100)
committerJoe Watkins <krakjoe@php.net>
Fri, 23 Jun 2017 06:53:12 +0000 (07:53 +0100)
commitbd8940a1fec0986b16681585d3b3314135f1eef3
tree501b9c2bac522763781e3bf0add2507f6b30cc6c
parentb90373376254d510868941b497bcac6152336623
parentb255b97e43a50897f8ba7b9fbc8ed0acbf436aea
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix method "eof"