From f2be2c32328195cd21f1be0dfa8a9a4966710f20 Mon Sep 17 00:00:00 2001
From: YunoHost <yolo@yunohost.org>
Date: Sun, 1 Jun 2014 15:15:04 +0200
Subject: [PATCH] Revert "Update roadmap.md"

This reverts commit 8894486a83495f9c7b0a5dd3b38321f16bde90b8.
---
 roadmap.md | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/roadmap.md b/roadmap.md
index a8c158c3..4a751dcf 100644
--- a/roadmap.md
+++ b/roadmap.md
@@ -1,3 +1,31 @@
 #Roadmap
 
-Disponible en [anglais](#/roadmap)
\ No newline at end of file
+---
+
+## v2.0 RC
+
+* ~~Mail configuration tests *(beudbeud)*~~
+* ~~Make pending apps official *(Ju)*~~
+* ~~SFTP *(kload)*~~
+* ~~DNS zone fix *(kload)*~~
+* ~~SSOwat stuffs (presistent rules, public root website) *(ezpen)*~~
+* ~~Mail forward configuration *(kload, beudbeud)*~~
+* ~~Test and upgrade official apps like Owncloud, Roundcube and Radicale *(packagers)*~~
+* ~~Upgrade function~~ + view *(beudbeud, opi)*
+* ~~uPnP rework *(kload, titoko)*~~
+* ~~Add warning in a sample backup view *(opi)*~~
+* ~~User interface design *(Courgette, opi)*~~
+* Moulinette/API refactoring *(jerome)*
+* Security check and complete patterns
+* ~~I18n *(opi, jerome)*~~
+* Lack of hairpinning hack *(kload)*
+
+
+## v2.0
+
+* ~~Add sexiness and a menu to YunoHost.org frontpage *(kload)*~~
+* **DOCUMENTATIONNNNNNN** *(everyone <3)*
+
+## v2.1
+
+* TO DO
\ No newline at end of file