diff options
| author | Joey Hess <joey@kitenet.net> | 2014-10-31 10:21:37 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-10-31 10:21:37 -0400 |
| commit | 43935ae7b06b44223cae4dc32613cd6751bc80f4 (patch) | |
| tree | 424120ce08af0bce3f1409a31861daf84b40951a /propellor.cabal | |
| parent | b1c4ddff04b5571e7ec60e7bfb014db76fd48eae (diff) | |
| parent | ca06c64bae82322348a07a97de924a1758a38b8f (diff) | |
Merge branch 'joeyconfig'
Conflicts:
privdata/privdata.gpg
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 282a5e04..43f098a8 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -78,10 +78,12 @@ Library Propellor.Property.Dns Propellor.Property.Docker Propellor.Property.File + Propellor.Property.Firewall Propellor.Property.Git Propellor.Property.Gpg Propellor.Property.Grub Propellor.Property.Network + Propellor.Property.Nginx Propellor.Property.Obnam Propellor.Property.OpenId Propellor.Property.Postfix |