summaryrefslogtreecommitdiff
path: root/config-simple.hs
diff options
context:
space:
mode:
authorJoey Hess2015-04-11 10:13:36 -0400
committerJoey Hess2015-04-11 10:13:36 -0400
commit9377e9ce7b10c9e68a192419e7b41e7dde40b045 (patch)
tree62fdf9397ac3f4829157b5788f671da8ea9023ad /config-simple.hs
parent85649a81bd1b08cd1390221ff0f7990165dbd27a (diff)
parentaa278d34a03ee77b0d78cd784ef7d1aaa00921f3 (diff)
Merge branch 'joeyconfig'
Conflicts: privdata.joey/privdata.gpg
Diffstat (limited to 'config-simple.hs')
0 files changed, 0 insertions, 0 deletions