From: Graham Leggett <minfrin@apache.org>
Date: Mon, 17 Jul 2023 20:46:09 +0000 (+0000)
Subject: Backport proposal already backported in r1911060.
X-Git-Tag: 2.4.58-rc1-candidate~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1257f0157755bb94e204f3c57570cbcdbc7694ae;p=thirdparty%2Fapache%2Fhttpd.git

Backport proposal already backported in r1911060.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911076 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 01c7fa6df30..e2cefa33811 100644
--- a/STATUS
+++ b/STATUS
@@ -152,15 +152,7 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mime.types update to sync with trunk
-     Trunk version of patch:
-        https://svn.apache.org/r1884511
-        https://svn.apache.org/r1901273
-        https://svn.apache.org/r1910843
-        https://svn.apache.org/r1910849
-     2.4.x version of patch:
-        svn merge -c 1884511,1901273,1910843,1910849 ^/httpd/httpd/trunk .
-     +1: jorton, icing, covener
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]