summaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2017-01-12 11:29:28 +0100
committermh <mh@immerda.ch>2017-01-12 11:29:28 +0100
commit53fa57dbd5bd1ea0e8da5aaffe509df7a47d1730 (patch)
treeb8027acdad3a0013033210c6f95ebc2b50d42a0c /files
parent8b20a24773e646a827f5bd9eb6030bfcbf12137d (diff)
parent6d78d6c7b5c7617077260c94d7158b61f430494e (diff)
Merge remote-tracking branch 'github/master'
Diffstat (limited to 'files')
-rw-r--r--files/boilerplate/tunnels.footer (renamed from files/boilerplate/tunnel.footer)0
-rw-r--r--files/boilerplate/tunnels.header (renamed from files/boilerplate/tunnel.header)0
2 files changed, 0 insertions, 0 deletions
diff --git a/files/boilerplate/tunnel.footer b/files/boilerplate/tunnels.footer
index 5e12d1d..5e12d1d 100644
--- a/files/boilerplate/tunnel.footer
+++ b/files/boilerplate/tunnels.footer
diff --git a/files/boilerplate/tunnel.header b/files/boilerplate/tunnels.header
index 638fd56..638fd56 100644
--- a/files/boilerplate/tunnel.header
+++ b/files/boilerplate/tunnels.header