diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-07-10 22:37:07 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-07-10 22:37:07 -0400 |
| commit | fb3fc7dec87625180e5d097826c6ef15dcab5b5c (patch) | |
| tree | 94ad0b924d4ffe4048a78faef5498c50ef801964 | |
| parent | 4c175849c65d1464de95629ac2ee26716180a27d (diff) | |
| parent | 8946b47db61d4debebe3a64637b4dbaa1d2c39f6 (diff) | |
Merge branch 'joeyconfig'
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | propellor.cabal | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 4cb94403..3b20a402 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -propellor (2.6.0) UNRELEASED; urgency=medium +propellor (2.6.0) unstable; urgency=medium * Replace String type synonym Docker.Image by a data type which allows to specify an image name and an optional tag. (API change) @@ -9,7 +9,7 @@ propellor (2.6.0) UNRELEASED; urgency=medium Thanks, Sean Whitton * Fix make install target to work even when git is not configured. - -- Joey Hess <id@joeyh.name> Tue, 16 Jun 2015 14:49:12 -0400 + -- Joey Hess <id@joeyh.name> Fri, 10 Jul 2015 22:36:29 -0400 propellor (2.5.0) unstable; urgency=medium diff --git a/propellor.cabal b/propellor.cabal index ad9f4530..1c6664b2 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -1,5 +1,5 @@ Name: propellor -Version: 2.5.0 +Version: 2.6.0 Cabal-Version: >= 1.6 License: BSD3 Maintainer: Joey Hess <id@joeyh.name> |