summaryrefslogtreecommitdiff
path: root/Assistant.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-04-02 17:51:41 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-04-02 17:51:41 -0400
commit58d29d26e87d880e59d150c83432d2f8280ee9ef (patch)
treee39a9bb62b0928edc14f88edaa4bdb6cccd79c32 /Assistant.hs
parent065be817516e8940975cda00ef668d7453ee07f7 (diff)
parent538523413fa85c0ca92928fb41bc681d949e4b80 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'Assistant.hs')
0 files changed, 0 insertions, 0 deletions