summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorJoey Hess2019-01-18 12:08:34 -0400
committerJoey Hess2019-01-18 12:08:34 -0400
commit876458adbc41a94c06d68b70e8b7b27288479592 (patch)
treea04d307b7d6eb0644f51af12285742f9b2f726d5 /debian/changelog
parent80af78c2bbbc1684a1085225b5754f4fcda4cbcb (diff)
parentf42a71ab2653707be4fcdaf1ce0f9fff209d8f12 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 8ad70497..8bff519b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ propellor (5.6.0) UNRELEASED; urgency=medium
* Fix build with ghc 8.6.3.
* Avoid exposing the constructor of OuterMetaTypesWitness, to avoid
the kind of mistake that led to the withOS bug.
+ * Merged Utility changes from git-annex.
-- Joey Hess <id@joeyh.name> Tue, 23 Oct 2018 11:37:16 -0400