]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorAnatol Belski <ab@php.net>
Wed, 17 Jan 2018 13:47:39 +0000 (14:47 +0100)
committerAnatol Belski <ab@php.net>
Wed, 17 Jan 2018 13:47:39 +0000 (14:47 +0100)
* PHP-7.1:
  Add switches for Spectre variant 1 mitigation

1  2 
win32/build/confutils.js

Simple merge