]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorAnatol Belski <ab@php.net>
Sat, 29 Oct 2016 15:58:01 +0000 (17:58 +0200)
committerAnatol Belski <ab@php.net>
Sat, 29 Oct 2016 15:58:01 +0000 (17:58 +0200)
* PHP-7.1:
  fix condition

1  2 
win32/build/confutils.js

Simple merge