From 51e21e040c65781cea10b54365e87fa8e0459737 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 10 Oct 2011 19:12:00 -0400
Subject: [PATCH] Merge branch 'master' into rpc

---
 distrib/gitblit.properties |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index 14ec79f..2d9bb03 100644
--- a/distrib/gitblit.properties
+++ b/distrib/gitblit.properties
@@ -126,7 +126,7 @@
 # This can point to a file with Markdown content.
 # Specifying "gitblit" uses the internal login message.
 #
-# SINCE 0.6.1
+# SINCE 0.7.0
 web.loginMessage = gitblit
 
 # This is the message displayed above the repositories table.
@@ -465,6 +465,12 @@
 # RESTART REQUIRED
 server.useNio = true
 
+# Context path for the application.
+#
+# SINCE 0.7.0
+# RESTART REQUIRED
+server.contextPath = /
+
 # Standard http port to serve.  <= 0 disables this connector.
 # On Unix/Linux systems, ports < 1024 require root permissions.
 # Recommended value: 80 or 8080

--
Gitblit v1.9.1