]> granicus.if.org Git - php/commitdiff
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)
* PHP-7.2:
  Fixed incorrect ZEND_ACC_ARENA_ALLOCATED usage (it must be used only for internal functions).

1  2 
Zend/zend_inheritance.c

Simple merge