jetty.project/jetty-distribution
Greg Wilkins 98b654ba20 Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-distribution/pom.xml
2014-08-14 08:38:25 +10:00
..
src/main Introduced configuration properties for ALPN/NPN advertised protocols. 2014-08-12 18:54:33 +02:00
pom.xml Merge remote-tracking branch 'origin/master' into jetty-http2 2014-08-14 08:38:25 +10:00