]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 77bb96d c4f69b6)
Merge branch 'PHP-5.6' into PHP-7.0
authorNikita Popov <nikic@php.net>
Wed, 20 Apr 2016 17:00:02 +0000 (19:00 +0200)
committerNikita Popov <nikic@php.net>
Wed, 20 Apr 2016 17:00:02 +0000 (19:00 +0200)
Conflicts:
Zend/zend_compile.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.