From 68ae0d32ea896155e5b611d10c1663b674c3a220 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 23 May 2014 08:31:13 -0400
Subject: [PATCH] Merge branch 'ticket/84' into develop

---
 src/main/distrib/data/gitblit.properties |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties
index 3215094..7d74c28 100644
--- a/src/main/distrib/data/gitblit.properties
+++ b/src/main/distrib/data/gitblit.properties
@@ -766,6 +766,11 @@
 # SINCE 0.5.0
 web.allowCookieAuthentication = true
 
+# Allow deletion of non-empty repositories. This is enforced for all delete vectors.
+#
+# SINCE 1.6.0
+web.allowDeletingNonEmptyRepositories = true
+
 # Config file for storing project metadata
 #
 # SINCE 1.2.0
@@ -1410,6 +1415,11 @@
 # use SMTPs flag
 mail.smtps = false
 
+# use STARTTLS flag
+#
+# SINCE 1.6.0
+mail.starttls = false
+
 # if your smtp server requires authentication, supply the credentials here
 #
 # SINCE 0.6.0

--
Gitblit v1.9.1