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

Merge branch 'master' into adjustedbranch

Browse source
This commit is contained in:
Joey Hess 2016-03-29 11:07:40 -04:00
commit 70e8d6860e
Failed to extract signature
858 changed files with 1137 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

9
doc/design/adjusted_branches/comment_2_ff7cbdf93f0be5886f212bdd411efb5b._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="joey"
subject="""comment 2"""
date="2016-03-14T20:38:09Z"
content="""
Yes, lots of things are possible with this. Filtering to only annexed files
probably. May be some hairyness around updating the branch when files are
got or dropped. Matching a preferred content expression, maybe..
"""]]

0
doc/design/assistant/blog/day_150__12:12.mdwn → doc/design/assistant/blog/day_150__12__58__12.mdwn
View file

2
doc/design/assistant/polls/Android_default_directory.mdwn
View file

@ -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 73 "/sdcard/annex" 6 "Whole /sdcard" 8 "DCIM directory (photos and videos only)" 2 "Same as for regular git-annex. ~/annex/"]]
[[!poll open=yes expandable=yes 73 "/sdcard/annex" 6 "Whole /sdcard" 8 "DCIM directory (photos and videos only)" 3 "Same as for regular git-annex. ~/annex/"]]