summaryrefslogtreecommitdiff
path: root/Assistant/Pairing.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-09-08 13:07:49 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-09-08 13:07:49 -0400
commit2d1b215328e40a7c9eb1dad0422917728faa79a0 (patch)
tree86b507ed3a689275dd6302fa781ebfe47aad25c3 /Assistant/Pairing.hs
parent3dd4b4058f7796c5d08f1172fcf39c777540f80e (diff)
parentea641a27bdc660eb061a3478f778577832f24300 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'Assistant/Pairing.hs')
0 files changed, 0 insertions, 0 deletions