From: Rosen Penev <redacted>
Date: Mon, 17 Feb 2020 03:37:58 +0000 (-0800)
Subject: Merge pull request #11294 from peter-stadler/nginx-util
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=e76a71e66702635125733dcad709f44347b399fd;p=openwrt-packages.git

Merge pull request #11294 from peter-stadler/nginx-util

[RFC] nginx-util: resolve recursive CONFLICTS
---

e76a71e66702635125733dcad709f44347b399fd