]> granicus.if.org Git - php/commit
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)
commit2d894916c532f3d7a17cdb5283cbdc9f85333801
treebcde66cd4b51a2649d10f9411df9bf2af5e9434d
parentff91800602930953d1a4533127e9807541e7d759
parent6808968c896a18d2b9f309b2fe63d529058b78b4
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Backport preloading trait fixup fixes