55 Commits

Author SHA1 Message Date
Joakim Erdfelt
496b4dfc83 [maven-release-plugin] prepare for next development iteration 2015-06-11 15:08:36 -07:00
Joakim Erdfelt
f53c5d8fac [maven-release-plugin] prepare release jetty-9.3.0.v20150611 2015-06-11 15:08:29 -07:00
Greg Wilkins
277ca5c065 fixed merge 2014-08-29 17:54:28 +10:00
Greg Wilkins
dacc796831 Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	tests/test-quickstart/pom.xml
2014-08-29 17:52:58 +10:00
Greg Wilkins
17c9a32268 moved quickstart to test-quickstart 2014-08-29 17:35:26 +10:00