summaryrefslogtreecommitdiff
path: root/Zend/zend_inheritance.c
diff options
context:
space:
mode:
authorJoe Watkins <krakjoe@php.net>2017-01-26 11:36:36 +0000
committerJoe Watkins <krakjoe@php.net>2017-01-26 11:36:36 +0000
commitbf914ff75a79aaacffebf689e6dd2b17175070b0 (patch)
treecf465c6f9128795e5b958611415c6161f889c8d4 /Zend/zend_inheritance.c
parent2d339fa4d1e82c888e4f514a741eb7ac14055671 (diff)
parenta3d3f76827c7c26f4cd9cdde967d4ed7cb7889fe (diff)
downloadphp-git-bf914ff75a79aaacffebf689e6dd2b17175070b0.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: Fix 00version.phpt when commit message has multiple lines.
Diffstat (limited to 'Zend/zend_inheritance.c')
0 files changed, 0 insertions, 0 deletions