From 94793ed10acf996a4b3f9f1a8538a1b997436d9f Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Sun, 14 Apr 2013 05:39:31 -0400
Subject: [PATCH] Merge remote-tracking branch 'upstream/master'

---
 src/main/java/com/gitblit/JsonServlet.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/gitblit/JsonServlet.java b/src/main/java/com/gitblit/JsonServlet.java
index 3ad2b7d..3ee4a27 100644
--- a/src/main/java/com/gitblit/JsonServlet.java
+++ b/src/main/java/com/gitblit/JsonServlet.java
@@ -123,6 +123,7 @@
 			// Send JSON response
 			String json = JsonUtils.toJsonString(o);
 			response.setCharacterEncoding(Constants.ENCODING);
+			response.setContentType("application/json");
 			response.getWriter().append(json);
 		}
 	}

--
Gitblit v1.9.1