aboutsummaryrefslogtreecommitdiff
path: root/doc/design/roadmap.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-12-24 14:48:51 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-12-24 15:01:55 -0400
commit42e08cd4575d3dc558dfe172c1f28c752d69e8c6 (patch)
tree78a8eddc31c390aaf8f66435bb13db9366f9a7c4 /doc/design/roadmap.mdwn
parent34f375526f44ff255d45bbabcd1425b3d5d0bb4a (diff)
parent3b9d9a267b7c9247d36d9b622e1b836724ca5fb0 (diff)
Merge branch 'master' into no-xmpp
Diffstat (limited to 'doc/design/roadmap.mdwn')
-rw-r--r--doc/design/roadmap.mdwn1
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/design/roadmap.mdwn b/doc/design/roadmap.mdwn
index 795cc8c84..5e636f33b 100644
--- a/doc/design/roadmap.mdwn
+++ b/doc/design/roadmap.mdwn
@@ -3,7 +3,6 @@
* [[design/caching_database]] for metadata views
* [[assistant/deltas]]
* [[assistant/gpgkeys]] management for the assistant
-* [[assistant/telehash]] or similar
* [[design/requests_routing]]
* [[design/new_repo_versions]]