]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4' into PHP-8.0
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 5 Nov 2020 15:37:45 +0000 (16:37 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 5 Nov 2020 15:37:45 +0000 (16:37 +0100)
* PHP-7.4:
  Backport preloading trait fixup fixes


Trivial merge