Joakim Erdfelt
|
c2e81f5584
|
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
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
|
2019-04-18 08:24:10 -05:00 |