diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-14 17:49:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-14 17:49:16 -0400 |
| commit | 8e2aad126880b26386d25244e1ee73332e38feb0 (patch) | |
| tree | 176c156579b12cca3915b1eb2203684b6dc7f478 | |
| parent | 5b30402922a6768690a699d29766cd3612ec3e78 (diff) | |
| parent | 95b9d52bdb445ab09c5cd698bcc559b7b718d903 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
| -rw-r--r-- | doc/design/assistant/blog/day_104__misc/comment_1_13d7fad2d3f8eab10314784c035e2a16._comment | 8 | ||||
| -rw-r--r-- | doc/design/assistant/polls/prioritizing_special_remotes.mdwn | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/design/assistant/blog/day_104__misc/comment_1_13d7fad2d3f8eab10314784c035e2a16._comment b/doc/design/assistant/blog/day_104__misc/comment_1_13d7fad2d3f8eab10314784c035e2a16._comment new file mode 100644 index 000000000..67e342a4b --- /dev/null +++ b/doc/design/assistant/blog/day_104__misc/comment_1_13d7fad2d3f8eab10314784c035e2a16._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawmubB1Sj2rwFoVdZYvGV0ACaQUJQyiJXJI" + nickname="Paul" + subject="Thank you for stickers" + date="2012-10-14T13:59:55Z" + content=""" +Mail received in Finland. +"""]] diff --git a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn index 31d189045..e9662f903 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)" 9 "Amazon Glacier" 7 "Box.com" 57 "My phone (or MP3 player)" 13 "Tahoe-LAFS" 4 "OpenStack SWIFT" 16 "Google Drive"]] +[[!poll open=yes 15 "Amazon S3 (done)" 9 "Amazon Glacier" 7 "Box.com" 57 "My phone (or MP3 player)" 14 "Tahoe-LAFS" 5 "OpenStack SWIFT" 17 "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 |