From f9405bfa30bab4223491898b8ba71dbb4b42c414 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 22 Oct 2014 08:06:25 -0400
Subject: [PATCH] Merge branch 'ticket/210' into develop

---
 releases.moxie |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/releases.moxie b/releases.moxie
index 2d31774..0cd7f0b 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -1,4 +1,37 @@
 #
+# ${project.version} release
+#
+r26: {
+    title: ${project.name} ${project.version} released
+    id: ${project.version}
+    date: ${project.buildDate}
+    note: ~
+    html: ~
+    text: ~
+    security: ~
+    fixes: ~
+    changes:
+    - Replaced Dagger with Guice (ticket-80)
+    - Use release name as root directory in Gitblit GO artifacts (ticket-109)
+    - Show team type in teams page (pr-217, ticket-168)
+    additions:
+    - Add Priority & Severity fields for tickets (pr-220, ticket-157)
+    - Add Maintenance ticket type (pr-223, ticket-206)
+    dependencyChanges:
+    - Guice 4.0-beta4 (ticket-80)
+    - SLF4j 1.7.7 (ticket-122)
+    - gson 2.2.2 (ticket-123)
+    - Freemarker 2.3.20 (ticket-124)
+    - Lucene 4.10.0 (ticket-159)
+    contributors:
+    - James Moger
+    - David Ostrovsky
+    - Alex Lewis
+    - Florian Zschocke
+    - Paul Martin
+}
+
+#
 # 1.6.1 release
 #
 r25: {
@@ -1532,6 +1565,6 @@
 	- James Moger
 }
 
-snapshot: ~
+snapshot: &r26
 release: &r25
 releases: &r[1..25]

--
Gitblit v1.9.1