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/roadmap.mkd |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/site/roadmap.mkd b/src/site/roadmap.mkd
index 03d69df..ea64321 100644
--- a/src/site/roadmap.mkd
+++ b/src/site/roadmap.mkd
@@ -3,7 +3,6 @@
 This is not exactly a formal roadmap but it is a priority list of what might be implemented in future releases.  
 This list is volatile and may not reflect what will be in the next release.
 
-* **In-Progress**: Integrate an SSH daemon (issue-369)
-* Diff should highlight inserted/removed fragment compared to original line
-* Respect Gerrit branch permissions, if found (issue 36)
-
+* Add support for Project owners/administrators (ticket-75)
+* Add Project create/update pages
+* Integrate improvements for git-flow (ticket-55)

--
Gitblit v1.9.1