summaryrefslogtreecommitdiff
path: root/Assistant
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-02-29 14:05:10 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-02-29 14:05:10 -0400
commit01996ef8faec84403ef4a416d4c6834ceda042b6 (patch)
treeeeb36e7363f9155d59fe7808287bf878d6b5e47b /Assistant
parentd9d8b83714e0c297858801c5fbf5bca056738ca8 (diff)
parent25b87aadd8bdca484f1fb073c38e169ee2bc7503 (diff)
Merge branch 'master' into adjustedbranch
Diffstat (limited to 'Assistant')
0 files changed, 0 insertions, 0 deletions