mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into remotecontrol

Browse source 
Conflicts:
	debian/changelog
This commit is contained in:
Joey Hess 2014-04-12 14:20:41 -04:00
commit 96ce2812e0
35 changed files with 392 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/design/roadmap.mdwn
View file

@ -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]]