From 5ec94c4282ed3630b7b4cd0fb5db62c20ce46d9d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 11 Feb 2015 10:15:47 -0500
Subject: [PATCH] Merge branch 'ticket/237' into develop

---
 src/main/java/.gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/.gitignore b/src/main/java/.gitignore
index b978906..92bb4af 100644
--- a/src/main/java/.gitignore
+++ b/src/main/java/.gitignore
@@ -1 +1,2 @@
 /clientapps.json
+/defaults.properties

--
Gitblit v1.9.1