]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Mon, 17 Jul 2017 17:40:31 +0000 (19:40 +0200)
committerAnatol Belski <ab@php.net>
Mon, 17 Jul 2017 17:40:31 +0000 (19:40 +0200)
* PHP-7.0:
  fix missing var for phpize

1  2 
win32/build/confutils.js

Simple merge