summaryrefslogtreecommitdiff
path: root/Assistant/XMPP.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-22 15:49:12 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-22 15:49:12 -0400
commita6e4d912f77815ba09ac5fe402c18af4a688397f (patch)
treebf479855815ba9ad5bcfe8061207b3f0582be84d /Assistant/XMPP.hs
parent40e1559718f80ab7b1b3ebb442a0663b7a0ae8f8 (diff)
parent988748ef65fee521e642e9985661e228df0312b7 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'Assistant/XMPP.hs')
0 files changed, 0 insertions, 0 deletions