summaryrefslogtreecommitdiff
path: root/Assistant.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-07-04 09:12:41 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-07-04 09:12:41 -0400
commitd3be4790937390c29bb76ab8abaeb934330ed37e (patch)
tree4359df1539364536242e1712e069682e62b6891f /Assistant.hs
parent1da79ea61faaddd71bdb84ee2c5a89bbe04a69ed (diff)
parent5153f845466ca1d2ad7abcd6c3172fde710c527b (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'Assistant.hs')
0 files changed, 0 insertions, 0 deletions