Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-19 04:55:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
jetty.project/jetty-server
History
Greg Wilkins 5b97d652e1 Merge remote-tracking branch 'origin/master' into jetty-http2 
Conflicts:
	jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn.mod
	jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpChannelOverSPDY.java
2014-09-04 17:43:18 +10:00
..
src
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-09-04 17:43:18 +10:00
pom.xml
moved config plugin to profile
2014-08-15 19:53:52 +10:00