]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorAnatol Belski <ab@php.net>
Sat, 12 Nov 2016 01:39:30 +0000 (02:39 +0100)
committerAnatol Belski <ab@php.net>
Sat, 12 Nov 2016 01:39:30 +0000 (02:39 +0100)
* PHP-7.1:
  fix erroneous line in confutils.js

1  2 
win32/build/confutils.js

Simple merge