Merge remote-tracking branch 'origin/master' into jetty-9-alpn

Browse Source

Conflicts:
	apache-jsp/pom.xml
	apache-jstl/pom.xml
	jetty-quickstart/pom.xml

...

This commit is contained in:

Greg Wilkins 2014-03-31 14:13:32 +11:00

parent 81e14cf59d a1d20956b1

commit 9bce638719

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available