From: Yann Ylavic Date: Fri, 21 Feb 2020 00:39:53 +0000 (+0000) Subject: Backported. [skip ci] X-Git-Tag: 2.4.42~60 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2fa82844867888a2e9afad9ab568c93fa76baec;p=thirdparty%2Fapache%2Fhttpd.git Backported. [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874291 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 9bb4049e5a2..2e87e3d8c0b 100644 --- a/STATUS +++ b/STATUS @@ -132,13 +132,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) Add a config layout for OpenWRT - trunk patch: http://svn.apache.org/r1872036 - http://svn.apache.org/r1872093 - http://svn.apache.org/r1872102 - 2.4.x patch: svn merge -c r1872036,1872093,1872102 ^/httpd/httpd/trunk . - +1: minfrin, jim (inspection), ylavic - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ]