summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2017-07-13 13:34:57 -0400
committerJoey Hess2017-07-13 13:34:57 -0400
commit44399c31269affb06c06dff96f923911ca2218b4 (patch)
treeb71fbbf71c9d1f27a4639f4ec667ae9e047b28bf /src
parentf33a1090b4347679602d6f75c281654ae46435b9 (diff)
parent8600d11c63087e1f1d7485d42345933c06e93445 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src')
l---------src/propellor-config.hs (renamed from src/config.hs)0
1 files changed, 0 insertions, 0 deletions
diff --git a/src/config.hs b/src/propellor-config.hs
index e3af968e..e3af968e 120000
--- a/src/config.hs
+++ b/src/propellor-config.hs