summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorMark Pemberton <mpemberton5@gmail.com>2011-05-21 21:38:25 -0400
committerMark Pemberton <mpemberton5@gmail.com>2011-05-21 21:38:25 -0400
commitb105867e75f103ae2b0c54edfaa9ce6467a8a258 (patch)
tree299bd99f271a55a98de88e8b27e457ea8401d2f1 /data
parente0149e24e2b5fac3b875fda468b18fbe2b6b1218 (diff)
parent97bba97049eeed2ecec022caa641b50ca507cb72 (diff)
downloadsemanticscuttle-b105867e75f103ae2b0c54edfaa9ce6467a8a258.tar.gz
semanticscuttle-b105867e75f103ae2b0c54edfaa9ce6467a8a258.tar.bz2
Merge branch 'master' into privatekey2
Diffstat (limited to 'data')
-rw-r--r--data/.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/data/.gitignore b/data/.gitignore
deleted file mode 100644
index 4f4773f..0000000
--- a/data/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-config.php