Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
jetty.project/jetty-alpn
History
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
..
jetty-alpn-client Updating to version 9.4.16-SNAPSHOT 2019-02-15 13:35:15 -05:00
jetty-alpn-conscrypt-client Merge branch `jetty-9.4.x` into `jetty-10.0.x` 2019-03-15 16:00:59 -05:00
jetty-alpn-conscrypt-server Merge branch `jetty-9.4.x` into `jetty-10.0.x` 2019-03-15 16:00:59 -05:00
jetty-alpn-java-client Updating to version 9.4.16-SNAPSHOT 2019-02-15 13:35:15 -05:00
jetty-alpn-java-server Updating to version 9.4.16-SNAPSHOT 2019-02-15 13:35:15 -05:00
jetty-alpn-server Updating to version 9.4.16-SNAPSHOT 2019-02-15 13:35:15 -05:00
pom.xml Updating to version 9.4.16-SNAPSHOT 2019-02-15 13:35:15 -05:00