From 56619e42f0a1e555c004374e7f2b13f744ab23f5 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 16 Apr 2016 15:17:12 -0400
Subject: [PATCH] Merge pull request #1047 from yyjdelete/patch-1

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

diff --git a/.gitignore b/.gitignore
index 3ad2f7e..e268ccb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,32 @@
+tags
 /temp
 /lib
 /ext
 /build
-/keystore
-/gitblit.zip
-/gitblit-0.1.0-SNAPSHOT.zip
+/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