Joakim Erdfelt 3861e9f9ca Merge branch 'jetty-9.4.x' into jetty-10.0.x ... Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> # Conflicts: # jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java # jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java		2019-09-13 10:02:05 -05:00
..
src	Merge branch 'jetty-9.4.x' into jetty-10.0.x	2019-09-13 10:02:05 -05:00
pom.xml	Updating to version 9.4.21-SNAPSHOT	2019-08-13 17:34:20 -05:00