]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7881e92 709e4e4)
Merge branch 'PHP-7.1' into PHP-7.2
authorDmitry Stogov <dmitry@zend.com>
Wed, 29 Aug 2018 20:41:14 +0000 (23:41 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 29 Aug 2018 20:41:14 +0000 (23:41 +0300)
commitfd5a453cb9976af6f1f9e1a72135c03804f208f6
tree988dcd58c14c9a01e8cb82c991f92e6144719db9tree | snapshot
parent7881e92c2440b34640b9210125a9862bee06bc71commit | diff
parent709e4e4f17ddbeb99b366c293c3e2eaa16480a7acommit | diff
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed incorrect ZEND_ACC_ARENA_ALLOCATED usage (it must be used only for internal functions).
Zend/zend_inheritance.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.