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-websocket/websocket-server
History
Joakim Erdfelt 6e952d4618 Merge branch 'jetty-9.2.x' 
Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-start/src/test/java/org/eclipse/jetty/start/LicensingTest.java
 		2015-03-16 10:25:15 -07:00
..
src Delaying decoration of websocket endpoints 2015-03-12 10:09:52 -07:00
pom.xml Merge branch 'jetty-9.2.x' 2015-03-16 10:25:15 -07:00