mirror of
https://github.com/jetty/jetty.project.git
synced 2025-02-15 11:04:49 +00:00
c2e81f5584
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> # Conflicts: # jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/WebAppMarshaller.java # jetty-infinispan/pom.xml # jetty-server/src/main/java/org/eclipse/jetty/server/MultiParts.java # jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java