]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Tue, 31 Oct 2017 09:35:59 +0000 (10:35 +0100)
committerAnatol Belski <ab@php.net>
Tue, 31 Oct 2017 09:35:59 +0000 (10:35 +0100)
* PHP-7.0:
  Fix year
  Add /nologo

1  2 
win32/build/confutils.js

Simple merge