summaryrefslogtreecommitdiff
path: root/doc/design/roadmap.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-01-13 13:08:38 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-01-13 13:08:58 -0400
commitf69a115326880ca632f347ced426ce32125c9ddd (patch)
tree8cea54dd400c61ab4a9a34976a0762ef4bb9f631 /doc/design/roadmap.mdwn
parent37996aeeb710f0b3b27b569eb884e697476c68f3 (diff)
add telehash design page; update roadmap
Diffstat (limited to 'doc/design/roadmap.mdwn')
-rw-r--r--doc/design/roadmap.mdwn6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/design/roadmap.mdwn b/doc/design/roadmap.mdwn
index 6b7e2b6f6..3a28c271e 100644
--- a/doc/design/roadmap.mdwn
+++ b/doc/design/roadmap.mdwn
@@ -9,10 +9,10 @@ Now in the
* Month 3 user-driven features and polishing [[todo/direct_mode_guard]] [[assistant/upgrading]]
* Month 4 [[Windows_webapp|assistant/Windows]], Linux arm, [[todo/support_for_writing_external_special_remotes]]
* **Month 5 user-driven features and polishing**
-* Month 6 [[!traillink assistant/xmpp_security]]
+* Month 6 get [[assistant/Android]] and Windows out of beta
* Month 7 user-driven features and polishing
-* Month 8 [[!traillink assistant/gpgkeys]] [[!traillink assistant/sshpassword]]
-* Month 9 get [[assistant/Android]] and Windows out of beta
+* Month 8 [[!traillink assistant/telehash]]
+* Month 9 [[!traillink assistant/gpgkeys]] [[!traillink assistant/sshpassword]]
* Month 10 user-driven features and polishing
* Month 11 [[!traillink assistant/chunks]] [[!traillink assistant/deltas]]
* Month 12 user-driven features and polishing