Joakim Erdfelt 95a6b76851 Merge branch `jetty-9.4.x` into `jetty-10.0.x` ... Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> # Conflicts: # examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebApp.java # jetty-osgi/test-jetty-osgi/pom.xml # jetty-server/src/main/java/org/eclipse/jetty/server/Server.java # jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java		2019-03-15 16:00:59 -05:00
..
src/main	Merge branch `jetty-9.4.x` into `jetty-10.0.x`	2019-03-15 16:00:59 -05:00
pom.xml	Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x	2019-03-12 12:14:46 +11:00