summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2017-07-26 23:40:47 -0400
committerJoey Hess2017-07-26 23:40:47 -0400
commita9eac78268e28d7194d3f9f4a382ff6658defb0c (patch)
tree9afc43cd3b71fb8ad47fd35c3e66440b54689406 /debian
parent989cf9823fe5e5efb57d6a08da18bb46f548cdbe (diff)
parent89816fb838873fc97ffa9d3827440bebb848c140 (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 0e7c6314..3944f454 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-propellor (4.6.0) UNRELEASED; urgency=medium
+propellor (4.6.0) unstable; urgency=medium
* Add Typeable instance to Bootstrapper, fixing build with old versions
of ghc.
@@ -7,7 +7,7 @@ propellor (4.6.0) UNRELEASED; urgency=medium
Network.preserveStatic.
(Minor API change)
- -- Joey Hess <id@joeyh.name> Tue, 25 Jul 2017 21:01:23 -0400
+ -- Joey Hess <id@joeyh.name> Wed, 26 Jul 2017 20:02:50 -0400
propellor (4.5.2) unstable; urgency=medium