]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorXinchen Hui <laruence@gmail.com>
Wed, 3 Jan 2018 08:02:15 +0000 (16:02 +0800)
committerXinchen Hui <laruence@gmail.com>
Wed, 3 Jan 2018 08:02:15 +0000 (16:02 +0800)
* PHP-7.2:
  Happy new year (Update copyright to 2018)

Conflicts:
ext/phar/LICENSE

1  2 
ext/opcache/ZendAccelerator.c
win32/build/confutils.js

Simple merge
Simple merge