tree 7ac8077a01055782839edb5369239e2e08af76ec
parent 474d304e6945a78bb93491259d69b7c6dd339f5c
parent ce525a6e99274c217db4ccf7f3a2ad028ea0a3a3
author Piotr Sikora <piotrsikora@google.com> 1596013317 -0700
committer Piotr Sikora <piotrsikora@google.com> 1596021631 -0700

Merge branch 'nginx' (nginx-1.19.1).

Change-Id: I92dececf032ea3e1da47f475a578840e4681117d
Signed-off-by: Piotr Sikora <piotrsikora@google.com>