Joakim Erdfelt cc58a74662 Merge branch 'jetty-9.4.x' into jetty-10.0.x ... Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> # Conflicts: # jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java # jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebInfConfigurationTest.java		2019-11-07 15:37:30 -06:00
..
src	Merge branch 'jetty-9.4.x' into jetty-10.0.x	2019-11-07 15:37:30 -06:00
pom.xml	Updating to version 9.4.23-SNAPSHOT	2019-10-22 09:19:41 -05:00