From 3bddeebcebf197ed6f8f785b26fba02faebd5344 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 26 Feb 2015 08:16:44 -0500
Subject: [PATCH] Merge branch 'ticket/238' 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