summaryrefslogtreecommitdiff
path: root/Assistant/Pairing.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-10 16:56:21 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-10 16:56:21 -0400
commit18c46ef1ea6c3fd6f199a098e8837b27e4102722 (patch)
tree2f7e042b11d31c6491037d0bf8bf306c84260ac6 /Assistant/Pairing.hs
parent92ee44f4f8cac9b58e04d3b701c59274a839472e (diff)
parentff0c99cb3da7a559a9759f37bc1b933499b62a7b (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'Assistant/Pairing.hs')
0 files changed, 0 insertions, 0 deletions