summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2017-01-22 09:29:21 -0400
committerJoey Hess <joeyh@joeyh.name>2017-01-22 09:29:21 -0400
commit57ea2c4d205e848ad3843d4bd119079a9e2718fc (patch)
treec1121b737fc8a584fb0e1f5b2efc120307395e3c
parent13e2d75c713eecf0184d621922f3f8cca4a25933 (diff)
parentbdc241574b8c53a1b624250d217c53a160e5dd57 (diff)
downloadkeysafe-57ea2c4d205e848ad3843d4bd119079a9e2718fc.tar.gz
Merge ssh://keysafe.branchable.com
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 60a6dcc..a199c88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
dist/*
.stack-work/*
keysafe
+doc/.ikiwiki