From d40a44c8c8df8f6bd81c93e72314224f85656f18 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 07 Mar 2015 09:27:05 -0500
Subject: [PATCH] Merge branch 'ticket/245' into develop

---
 .gitignore |   30 ++++++++++++++++++++++--------
 1 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5236c64..6c262bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,14 +2,28 @@
 /lib
 /ext
 /build
-/keystore
-/*.zip
-/gitblit.properties
-/users.properties
 /site
 /git
-/target
 /build.properties
-/war
-/*.war
-/proposals
+/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

--
Gitblit v1.9.1