]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ba39ee9 fd5a453)
Merge branch 'PHP-7.2' into PHP-7.3
authorDmitry Stogov <dmitry@zend.com>
Wed, 29 Aug 2018 20:41:22 +0000 (23:41 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 29 Aug 2018 20:41:22 +0000 (23:41 +0300)
commit566a75e97c7df74d3172b0b8442d857105123135
tree0bea95f76c5ce2fe85fe9964d28793b0d6ddb473tree | snapshot
parentba39ee99ca059143a5d283089089c54e3453fd90commit | diff
parentfd5a453cb9976af6f1f9e1a72135c03804f208f6commit | diff
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  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.