Merge branch 'edge' of git@github.com:ktgit/knowledgetree into edge

unknown
2 parents 25e11ae5 cef1cf12
Showing 1 changed file with 1 additions and 1 deletions
.gitignore
@@ -13,4 +13,4 @@ clienttools/Office
 .gitmodules
 *.out
 baobab/
-ktoffice/
+ktoffice*/