From ed552ba47c02779c270ffd62841d6d1048dade70 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Sun, 22 Nov 2015 14:37:16 -0500 Subject: [PATCH] Merge branch '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