diff options
author | Greg Wilkins | 2013-04-05 05:35:37 +0000 |
---|---|---|
committer | Greg Wilkins | 2013-04-05 05:35:37 +0000 |
commit | abcb4f163b7a21f0cb5949a49eb6409310797b52 (patch) | |
tree | 78c915ffc011846f0154aeffb8060e817c6c9d33 /jetty-security/pom.xml | |
parent | 6b3cb20720c12e83845a0fe8fa347376f240a9f2 (diff) | |
parent | cada28e8cfc0d5b561829296977af8b29b84ad48 (diff) | |
download | org.eclipse.jetty.project-abcb4f163b7a21f0cb5949a49eb6409310797b52.tar.gz org.eclipse.jetty.project-abcb4f163b7a21f0cb5949a49eb6409310797b52.tar.xz org.eclipse.jetty.project-abcb4f163b7a21f0cb5949a49eb6409310797b52.zip |
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
Diffstat (limited to 'jetty-security/pom.xml')
0 files changed, 0 insertions, 0 deletions