Joakim Erdfelt c0f8a46c35 Merge branch 'jetty-9.4.x' into jetty-10.0.x ... Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> # Conflicts: # jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunDistro.java		2019-12-02 15:29:30 -06:00
..
it	Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x	2019-11-27 15:32:04 +11:00
main	Merge branch 'jetty-9.4.x' into jetty-10.0.x	2019-12-02 15:29:30 -06:00
test	Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x	2019-11-27 15:32:04 +11:00