diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-04-14 13:38:35 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-14 13:38:35 -0400 |
| commit | 190656ed99241af034e1a105eefcd5a72214fe2f (patch) | |
| tree | 30310a17114b9d64b7c51a73b3af3a9cc171a56e /doc/design/assistant | |
| parent | 65c7bfcc55ec2243e1f4dcb5bbca54dce494bc63 (diff) | |
| parent | 36969d80d4c921dea8f3b48465dd9a533f97ecae (diff) | |
Merge branch 'master' into remotecontrol
Conflicts:
doc/devblog/day_152__more_ssh_connection_caching.mdwn
Diffstat (limited to 'doc/design/assistant')
| -rw-r--r-- | doc/design/assistant/polls/Android_default_directory.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/design/assistant/polls/Android_default_directory.mdwn b/doc/design/assistant/polls/Android_default_directory.mdwn index 869aedf4b..6d5a07ee3 100644 --- a/doc/design/assistant/polls/Android_default_directory.mdwn +++ b/doc/design/assistant/polls/Android_default_directory.mdwn @@ -4,4 +4,4 @@ Same as the desktop webapp, users will be able to enter a directory they want the first time they run it, but to save typing on android, anything that gets enough votes will be included in a list of choices as well. -[[!poll open=yes expandable=yes 66 "/sdcard/annex" 6 "Whole /sdcard" 6 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]] +[[!poll open=yes expandable=yes 66 "/sdcard/annex" 6 "Whole /sdcard" 7 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]] |