summaryrefslogtreecommitdiff
path: root/Assistant/XMPP.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-08 14:02:25 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-08 14:02:25 -0400
commit5f8500e4f1d9f55e328fadba5610084bd3cf6570 (patch)
tree204450c86a9a7bd5cc44262c51155d0a86be7e0b /Assistant/XMPP.hs
parentd7a6c94db9690772f9a2cbfcd6993819b4939d04 (diff)
parent367e30cca0d18713c50155ef26bc323d874624cd (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'Assistant/XMPP.hs')
0 files changed, 0 insertions, 0 deletions