Joakim Erdfelt 2995029c98 Merge branch `jetty-9.3.x` into `jetty-9.4.x` ... Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> # Conflicts: # jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java # jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientURITest.java # jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/AbstractHttpClientServerTest.java # jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java # jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java # jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java # jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java # jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java # pom.xml		2019-04-17 17:10:53 -05:00
..
src	Merge branch `jetty-9.3.x` into `jetty-9.4.x`	2019-04-17 17:10:53 -05:00
.gitignore	…
pom.xml	Updating to version 9.3.27-SNAPSHOT	2019-04-03 18:46:31 -05:00