From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates

---
 .gitignore |   48 +++++++++++++++++++++++++++++++-----------------
 1 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 057f6d7..e268ccb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,32 @@
-/temp
-/lib
-/ext
-/build
-/site
-/git
-/build.properties
-/federation.properties
-/mailtest.properties
-/.settings/
-/src/main/java/WEB-INF/reference.properties
-/bin/
-/build-demo.xml
-*.directory
-/.gradle
-/pom.xml
-/x509test
+tags
+/temp
+/lib
+/ext
+/build
+/site
+/git
+/lucene
+/build.properties
+/federation.properties
+/mailtest.properties
+/test-users.conf
+/.settings/
+/src/main/java/reference.properties
+/src/main/java/WEB-INF/reference.properties
+/bin/
+/build-demo.xml
+*.directory
+/.gradle
+/pom.xml
+/x509test
 /data
+/*.conf
+/build-next.xml
+/*.ps1
+/*.sh
+/*.factorypath
+/src/main/dagger
+/**/.idea
+/**/init.lua
+/**/session
+/nbproject/private

--
Gitblit v1.9.1