From ed552ba47c02779c270ffd62841d6d1048dade70 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 22 Nov 2015 14:37:16 -0500
Subject: [PATCH] Merge branch 'develop'

---
 .gitignore |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6c262bb..e268ccb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,11 @@
+tags
 /temp
 /lib
 /ext
 /build
 /site
 /git
+/lucene
 /build.properties
 /federation.properties
 /mailtest.properties
@@ -27,3 +29,4 @@
 /**/.idea
 /**/init.lua
 /**/session
+/nbproject/private

--
Gitblit v1.9.1