Merge branch 'nyov/wiki' into 'master'

gitignore new wiki repo

I'm sorry I forgot this in the original commit.

See merge request !5

diff --git a/.gitignore b/.gitignore
index 71bda24bc4b04a5a959a31125ec532f4330bd234..100ef0b1cfa057302dfc24baba3c663a33cfb250 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /data.old/
 /xonstat/
 /xonstatdb/
+/wiki