Merge branch 'master' of ssh://git-annex.branchable.com

Conflicts:
	doc/polls/2013/operating_system.mdwn
This commit is contained in:
Joey Hess 2013-11-13 16:11:42 -04:00
commit 621939b5c6

View file

@ -1,5 +1,5 @@
Pick the operating system which you use git-annex on the most.
[[!poll expandable=yes open=yes 0 "Linux" 0 "OSX" 0 "Android" 0 "other Unix" 0 "Windows"]]
[[!poll expandable=yes open=yes 1 "Linux" 0 "OSX" 0 "Android" 0 "other Unix" 0 "Windows"]]
[[!sidebar content=""]]