From 1c261bd5fbe8f4750f17678f85f98cf101439b71 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 05 Oct 2015 08:04:34 -0400
Subject: [PATCH] Merge branch 'topic/pr-935' 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