Joakim Erdfelt e1427ea2ee Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x ... # Conflicts: # jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java		2020-07-31 11:04:45 -05:00
..
src/main/resources	Ensuring that usage of "/**/" within tests don't trigger checkstyle violation.	2020-06-25 09:23:46 -05:00
jetty-codestyle-eclipse-ide.xml	Merging build-resources from `jetty-9.4.x` to `jetty-10.0.x`	2019-08-14 09:40:46 -05:00
jetty-codestyle-intellij.xml	Merging build-resources from `jetty-9.4.x` to `jetty-10.0.x`	2019-08-14 09:40:46 -05:00
pom.xml	Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x	2020-07-31 11:04:45 -05:00