Joakim Erdfelt a305660c54 Merge branch `jetty-9.4.x` into `jetty-10.0.x` ... Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> # Conflicts: # jetty-server/src/main/config/etc/jetty-ssl-context.xml # jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/ClientContainer.java # jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java # jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java # jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java		2019-05-07 13:54:27 -05:00
..
src	Merge branch `jetty-9.4.x` into `jetty-10.0.x`	2019-05-07 13:54:27 -05:00
pom.xml	Updating to version 9.4.19-SNAPSHOT	2019-04-29 16:27:23 -05:00