From e46ddb3c20366d4d68409739e32717ab0d036aa4 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 04 Sep 2014 10:53:08 -0400
Subject: [PATCH] Merged #140 "Update French translation"

---
 releases.moxie |   28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/releases.moxie b/releases.moxie
index 64039bc..2a301ba 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -1,10 +1,28 @@
 #
 # ${project.version} release
 #
-r24: {
+r25: {
     title: ${project.name} ${project.version} released
     id: ${project.version}
     date: ${project.buildDate}
+    note: ~
+    html: ~
+    text: ~
+    security: ~
+    fixes: ~
+    changes: ~
+    additions: ~
+    dependencyChanges: ~
+    contributors: ~
+}
+
+#
+# 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
@@ -70,6 +88,7 @@
     - Add setting to control default thread pool size for miscellaneous background tasks (ticket-92)
     - Add Norwegian transation (pr-186)
     - Add German translation (pr-192)
+    - Add Italian translation (pr-196)
     dependencyChanges:
     - Update to javax.mail 1.5.1 (issue-417, ticket-58)
     contributors:
@@ -91,6 +110,7 @@
     - Dongsu Kim
     - Karanbir Singh
     - Tamás Papp
+    - GianMaria Romanato
     settings:
     - { name: 'web.allowDeletingNonEmptyRepositories', defaultValue: 'true' }
     - { name: 'web.includePersonalRepositories', defaultValue: 'false' }
@@ -1412,6 +1432,6 @@
 	- James Moger
 }
 
-snapshot: &r24
-release: &r23
-releases: &r[1..23]
+snapshot: &r25
+release: &r24
+releases: &r[1..24]

--
Gitblit v1.9.1