diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-07-17 16:51:00 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-07-17 16:51:00 -0400 |
| commit | 7e53d16aa18f343de70830219095fbf8e1566a2f (patch) | |
| tree | b31044c089a6099a7b2ebfed27c3de6a21085f93 /config.hs | |
| parent | e2792f93555c0d35313c976604c4ee20f3dd36e2 (diff) | |
| parent | c987a3a3bd14171071b85c5937773a47b23859ff (diff) | |
Merge branch 'master' into joeyconfig
Diffstat (limited to 'config.hs')
| l--------- | config.hs | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -joeyconfig.hs
\ No newline at end of file +config-simple.hs
\ No newline at end of file |