summaryrefslogtreecommitdiffstats
path: root/archiva-jetty
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2014-03-20 23:28:10 +0000
committerOlivier Lamy <olamy@apache.org>2014-03-20 23:28:10 +0000
commit269ede5bf074376a507385bba990255624b811a0 (patch)
treee240903341a18b1823ea77b834c82a1302a079f2 /archiva-jetty
parente72bb0a3a27a83430b5005af30d075b7334a2213 (diff)
downloadarchiva-269ede5bf074376a507385bba990255624b811a0.tar.gz
archiva-269ede5bf074376a507385bba990255624b811a0.zip
fix wrong merge
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1579832 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-jetty')
0 files changed, 0 insertions, 0 deletions