jetty.project/jetty-websocket/websocket-server
Joakim Erdfelt 31cd3fee84 Merge branch 'jetty-9.3.x'
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/PathMap.java
	jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathSpecSet.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
	jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java
	jetty-util/src/main/java/org/eclipse/jetty/util/RegexSet.java
2015-12-17 12:51:57 -07:00
..
src Merge branch 'jetty-9.3.x' 2015-12-17 12:51:57 -07:00
pom.xml Updating to version 9.3.7-SNAPSHOT 2015-11-06 12:13:00 -07:00