summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-11-05 16:37:45 +0100
committerNikita Popov <nikita.ppv@gmail.com>2020-11-05 16:37:45 +0100
commit2d894916c532f3d7a17cdb5283cbdc9f85333801 (patch)
treebcde66cd4b51a2649d10f9411df9bf2af5e9434d
parentff91800602930953d1a4533127e9807541e7d759 (diff)
parent6808968c896a18d2b9f309b2fe63d529058b78b4 (diff)
downloadphp-git-2d894916c532f3d7a17cdb5283cbdc9f85333801.tar.gz
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4: Backport preloading trait fixup fixes
0 files changed, 0 insertions, 0 deletions