aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaxigas <maxigas@anargeek.net>2013-04-11 18:44:37 +0200
committermaxigas <maxigas@anargeek.net>2013-04-11 18:44:37 +0200
commitcfa8b7f0bb7e52e6b6611f82b91560a7cb26767a (patch)
tree3c798075ffe77223238af3114b36473dad58e1ea
parent892e2b34b9ffbb908a3f7eabe6e2d3f0e2dad14f (diff)
parenta438ef5d09dcd8b42fefba09fcbbd54bdd503da6 (diff)
downloadpolicy-cfa8b7f0bb7e52e6b6611f82b91560a7cb26767a.tar.gz
policy-cfa8b7f0bb7e52e6b6611f82b91560a7cb26767a.tar.bz2
Merge branch 'master' of ssh://patron.pagekite.me/home/policy/policy
merging empty ikiwiki with the old one
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index e69de29..eecda60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/.ikiwiki