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-plus/src
History
Greg Wilkins 070ce9dd22 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
 		2013-09-09 15:41:17 +10:00
..
main Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-09 15:41:17 +10:00
test merge from jetty-8 and update license blocks. 2013-01-11 17:04:53 -06:00