]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorDmitry Stogov <dmitry@zend.com>
Thu, 28 Mar 2019 21:53:06 +0000 (00:53 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 28 Mar 2019 21:53:06 +0000 (00:53 +0300)
* PHP-7.4:
  Ignore "__format__" attribute

1  2 
ext/ffi/ffi.c

diff --cc ext/ffi/ffi.c
Simple merge