Merge branch 'master' into bug2716

This commit is contained in:
Frederik Petersen committed 2015-05-12 22:35:09 +02:00
commit b0bf4950d8
15 files changed
+331 -231

No files matched your search

@@ -83,7 +83,7 @@ public class CompetitorsJsonExportServlet extends AbstractJsonHttpServlet {
}
}
setJsonResponseHeader(response);
result.writeJSONString(response.getWriter());
response.setContentType("application/json");
}
}