Joakim Erdfelt 19f81c0ada Merge branch `jetty-9.4.x` into `jetty-10.0.x` ... Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> # Conflicts: # jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java		2019-04-10 16:15:53 -05:00
..
async-rest	Updating to version 9.3.27-SNAPSHOT	2019-04-03 17:32:08 +11:00
embedded	Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.	2019-04-06 13:45:54 +02:00
pom.xml	Merge branch `jetty-9.4.x` into `jetty-10.0.x`	2019-04-10 16:15:53 -05:00