diff options
| author | Joey Hess <joey@kitenet.net> | 2014-04-04 01:38:01 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-04 01:38:01 -0400 |
| commit | 336e3ccf84c50ecf41fe0212b7abc5d93947da5e (patch) | |
| tree | 1fb55e3653717bd7e5431a4c4e78bc6f3d01bdb6 /propellor.cabal | |
| parent | 2e2f4ac91369adf39fed54df10864f320a8227c1 (diff) | |
| parent | 25a002605056ca5b3ad93c038b424c952f1431d1 (diff) | |
Merge branch 'joeyconfig'
Conflicts:
config.hs
Diffstat (limited to 'propellor.cabal')
| -rw-r--r-- | propellor.cabal | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/propellor.cabal b/propellor.cabal index 5d601393..1382a43e 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -15,6 +15,8 @@ Extra-Source-Files: TODO CHANGELOG Makefile + config-simple.hs + config-joey.hs debian/changelog debian/README.Debian debian/propellor.1 |