Commit graph

4 commits

Author SHA1 Message Date
Joey Hess
621939b5c6 Merge branch 'master' of ssh://git-annex.branchable.com
Conflicts:
	doc/polls/2013/operating_system.mdwn
2013-11-13 16:11:42 -04:00
Joey Hess
578546001c turn off sidebar in polls 2013-11-13 16:09:41 -04:00
http://joeyh.name/
cd86a505f2 poll vote (Linux) 2013-11-13 20:08:28 +00:00
Joey Hess
1343a70885 poll 2013-11-13 16:06:21 -04:00