mirror of
https://github.com/jetty/jetty.project.git
synced 2025-02-19 13:06:06 +00:00
Conflicts: jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java