]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Sat, 24 Feb 2018 01:57:26 +0000 (17:57 -0800)
committerStanislav Malyshev <stas@php.net>
Sat, 24 Feb 2018 01:57:26 +0000 (17:57 -0800)
* PHP-5.6:
  [ci skip] Set FPM maintainership

1  2 
EXTENSIONS

diff --cc EXTENSIONS
Simple merge