diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-11-17 16:12:03 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-11-17 16:12:03 -0400 |
| commit | 12c5d34ee28c2d786b7f3ab0e17a590068231ed9 (patch) | |
| tree | 42d2a6e34f3e1db9084d561937b3efc8cd521f93 | |
| parent | 2544986bf452d8c780d547714070d978396fb836 (diff) | |
| parent | 64a297d11464d1358ecbd47c4901cb11c32cf4c1 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
Conflicts:
doc/design/assistant/polls/prioritizing_special_remotes.mdwn
| -rw-r--r-- | doc/design/assistant/polls/prioritizing_special_remotes.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn index 71a806147..6b5be1f29 100644 --- a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn +++ b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn @@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync. Help me prioritize my work: What special remote would you most like to use with the git-annex assistant? -[[!poll open=yes 15 "Amazon S3 (done)" 12 "Amazon Glacier" 9 "Box.com (done)" 62 "My phone (or MP3 player)" 15 "Tahoe-LAFS" 6 "OpenStack SWIFT" 23 "Google Drive"]] +[[!poll open=yes 15 "Amazon S3 (done)" 12 "Amazon Glacier" 9 "Box.com (done)" 63 "My phone (or MP3 player)" 15 "Tahoe-LAFS" 6 "OpenStack SWIFT" 23 "Google Drive"]] This poll is ordered with the options I consider easiest to build listed first. Mostly because git-annex already supports them and they |