Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

This commit is contained in:
Greg Wilkins 2016-10-26 20:39:29 +11:00
parent f4e6162b98 7f7021315d
commit 714d29db76
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pom.xml
View File

@ -1437,7 +1437,6 @@
<alpn.version>8.1.9.v20160720</alpn.version>
</properties>
</profile>
<<<<<<< HEAD
<profile>
<id>8u111</id>
<activation>