From 6c59a7f19fff3e24b738825ebb8659e6c260d5eb Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 02 Jul 2014 17:39:30 -0400
Subject: [PATCH] Merged #122 "Update to SLF4j 1.7.7"

---
 releases.moxie |   44 ++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/releases.moxie b/releases.moxie
index daf0a78..89b1a50 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -1,10 +1,46 @@
 #
 # ${project.version} release
 #
-r24: {
+r25: {
     title: ${project.name} ${project.version} released
     id: ${project.version}
     date: ${project.buildDate}
+    note: ~
+    html: ~
+    text: ~
+    security: ~
+    fixes:
+    - Fixed NPE when there are two repositories which only differ in case (pr-204, ticket-108)
+    - Fixed api/manager download links in documentation (issue-449, ticket-111)
+    - Fixed stackoverflow on (de)serialization of the history page (ticket-114)
+    - Fixed queries for milestones with hyphentated names (ticket-115)
+    - Fixed duplicate repositories on the dashboard (issue-454, ticket-117)
+    - Fixed lower-case project selection (ticket-118)
+    changes:
+    - Update Korean translation (pr-206, ticket-120)
+    - Improve web.canonicalUrl documentation (pr-205, ticket-121, issue-453)
+    additions: ~
+    dependencyChanges:
+    - Jetty 9.2.1 (pr-202)
+    - Lucene 4.8.1 (pr-201)
+    - JGit 3.4.0 (pr-200)
+    - SLF4j 1.7.7
+    contributors:
+    - James Moger
+    - David Ostrovsky
+    - Kyle Gottfried
+    - Yena Hong
+    - Eric Fairon
+    - Gareth Collins
+}
+
+#
+# 1.6.0 release
+#
+r24: {
+    title: Gitblit 1.6.0 released
+    id: 1.6.0
+    date: 2014-06-16
     note: ''
           The next major release (v1.7.0) will focus on:
           * ticket-75: making projects more useful including the concept of project ownership
@@ -1414,6 +1450,6 @@
 	- James Moger
 }
 
-snapshot: &r24
-release: &r23
-releases: &r[1..23]
+snapshot: ~
+release: &r24
+releases: &r[1..24]

--
Gitblit v1.9.1