summaryrefslogtreecommitdiffstats
path: root/etc/shorewall6/zones
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2013-06-14 11:37:11 +0200
committerHolger Levsen <holger@layer-acht.org>2013-06-14 11:37:11 +0200
commit9002fc3bffd5be5260b13b5a36cef8f468eb2fda (patch)
treebac20e7c6ba7bdb1abd455575b6dd78ca39ac33b /etc/shorewall6/zones
parent88de582a8a0a136632d0cb040a30b4d01ed8fa27 (diff)
parent37eb00f6cd2de9a33f72f171878ea0f9c8e38bf1 (diff)
downloadjenkins.debian.net-9002fc3bffd5be5260b13b5a36cef8f468eb2fda.tar.xz
Merge branch 'jessie'
Conflicts: job-cfg/g-i-installation.yaml fixed some timings too
Diffstat (limited to 'etc/shorewall6/zones')
0 files changed, 0 insertions, 0 deletions