From 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 17:36:12 -0400
Subject: [PATCH] Merge release 1.6.0

---
 src/site/features.mkd |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/site/features.mkd b/src/site/features.mkd
index 5981f83..d9ceba7 100644
--- a/src/site/features.mkd
+++ b/src/site/features.mkd
@@ -60,15 +60,18 @@
 - Customizable regular expression substitution for commit messages (i.e. bug or code review link integration)
 - Single text file for users configuration
 - Translations
-    - English
-    - Japanese
-    - Spanish
-    - Polish
-    - Korean
-    - Brazilian Portuguese
-    - Dutch
+    - German (de)
+    - English (en)
+    - Spanish (es)
+    - French (fr)
+    - Italian (it)
+    - Japanese (ja)
+    - Korean (ko)
+    - Dutch (nl)
+    - Norwegian (no)
+    - Polish (pl)
+    - Brazilian Portuguese (pt_BR)
     - Simplified Chinese (zh_CN)
-    - French
 
 ## Gitblit GO Features
 - Out-of-the-box integrated stack requiring minimal configuration

--
Gitblit v1.9.1