This repository was archived by the owner on Nov 17, 2023. It is now read-only.

[master] Forward-port #20492#20519

Merged

Zha0q1 merged 2 commits intoapache:masterfrom

josephevans:issue1_master

Aug 14, 2021

Commits on Aug 12, 2021

[v1.9.x] Make sure files with 2 licenses are listed properly in LICENSE. (#20492)
josephevans
committed
Merge remote-tracking branch 'upstream/master' into issue1_master
josephevans
committed