diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-04-12 14:20:41 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-12 14:20:41 -0400 |
| commit | d4e54c2eba70ca4587c9ef0f9599a53225506e6f (patch) | |
| tree | bca029eba2071672ee98f6a59fa0f1d20084786f /doc/design | |
| parent | db4897aaff83f33e049cbe731ae16da96f340297 (diff) | |
| parent | b356a4f8d13ca9e1e2d68b17dd0b7b93143c8ef5 (diff) | |
Merge branch 'master' into remotecontrol
Conflicts:
debian/changelog
Diffstat (limited to 'doc/design')
| -rw-r--r-- | doc/design/roadmap.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/design/roadmap.mdwn b/doc/design/roadmap.mdwn index 3fa261e6f..b7c48830d 100644 --- a/doc/design/roadmap.mdwn +++ b/doc/design/roadmap.mdwn @@ -11,7 +11,7 @@ Now in the * Month 5 user-driven features and polishing * Month 6 get Windows out of beta, [[!traillink design/metadata text="metadata and views"]] * Month 7 user-driven features and polishing -* **Month 8 [[!traillink assistant/telehash]]** +* **Month 8 [[!traillink git-remote-daemon]] [[!traillink assistant/telehash]]** * Month 9 [[!traillink assistant/gpgkeys]] [[!traillink assistant/sshpassword]] * Month 10 get [[assistant/Android]] out of beta * Month 11 [[!traillink assistant/chunks]] [[!traillink assistant/deltas]] |