summaryrefslogtreecommitdiff
path: root/Assistant/Pairing.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-09-11 01:01:42 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-09-11 01:01:42 -0400
commitb3f4c6eb683ebedf0e73bbca8305bb3f97cac6f1 (patch)
treec3ebf7d3d615340a65aa95c0a83f583010803f24 /Assistant/Pairing.hs
parent9ace0afdfed35ffcd344221e17b6eca8eeb56372 (diff)
parentbddf472ae4ae02663c528d1efc1945ea8b8fc296 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'Assistant/Pairing.hs')
0 files changed, 0 insertions, 0 deletions