From ae6db865961bca99f13cf6f5658c8265765d7b48 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 07 May 2014 10:28:29 -0400
Subject: [PATCH] Merge branch 'ticket/54' into develop

---
 .gitignore |   49 +++++++++++++++++++++++++++----------------------
 1 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3c0210d..c4a25da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,27 @@
-/temp
-/lib
-/ext
-/build
-/keystore
-/*.zip
-/gitblit.properties
-/users.properties
-/site
-/git
-/target
-/build.properties
-/war
-/*.war
-/proposals
-/*.jar
-/federation.properties
-/mailtest.properties
-/.settings/*.prefs
-/src/WEB-INF/reference.properties
-/bin/
-/.settings/
+/temp
+/lib
+/ext
+/build
+/site
+/git
+/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
+/src/main/java/.idea

--
Gitblit v1.9.1