summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2016-02-08 11:18:25 -0400
committerJoey Hess2016-02-08 11:18:25 -0400
commit719ee1c96ddfbe9e926a78a40d477fd429947c6f (patch)
tree6da39e5d64eaf01b731d1e1abd4d88ad1c4aae50 /debian
parent16a674dab73893657f040bbd15a04bf0ec5c44a7 (diff)
parentb33807cec25f232d5bd43fea6e954d596acbad24 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 3d18b8fb..b93059b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ propellor (2.15.4) UNRELEASED; urgency=medium
* Added Propellor.Property.LetsEncrypt
* Apache.httpsVirtualHost: New property, setting up a https vhost
with the certificate automatically obtained using letsencrypt.
+ * Allow using combineProperties and propertyList with lists of
+ RevertableProperty.
-- Joey Hess <id@joeyh.name> Mon, 18 Jan 2016 13:15:30 -0400