summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2015-12-19 16:42:45 -0400
committerJoey Hess2015-12-19 16:42:45 -0400
commit35113853cd1118a12debbdac2df85c02076f5a8f (patch)
tree810fa01bd47c5f31f6972cd1d1bf7c93b1d61cf7 /debian
parent4d12d728dd1ef087af39de142c0c5422495305b9 (diff)
parent4e4c7bb914779ded627bc28de116acd8b0867986 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index d9e9bead..a4857ba4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ propellor (2.15.1) UNRELEASED; urgency=medium
* Added User.systemAccountFor and User.systemAccountFor' properties.
Thanks, Félix Sipma.
* Merged Utility changes from git-annex.
+ * Gpg.keyImported converted to not use a flag file and instead check
+ if gpg has the provided key already.
+ Thanks, Félix Sipma.
-- Joey Hess <id@joeyh.name> Tue, 08 Dec 2015 11:59:43 -0400