summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2015-06-09 17:12:58 -0400
committerJoey Hess2015-06-09 17:12:58 -0400
commit2549d97c84ed19c74777ce70655ca6a33ae816ab (patch)
tree7b3d983c76b2b19f91769a9ab386be85a9573dd4 /debian
parent723f47d1ac6ebaddbe8df112a4b12ce7520dc89a (diff)
parentb5de5703a49e59db010518b89effdeba3b91a664 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 2441f4ab..6e641881 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,7 +23,7 @@ propellor (2.5.0) unstable; urgency=medium
(API change)
* Docker: volume and publish accept Bound FilePath and Bound Port,
respectively. They also continue to accept Strings, for backwards
- compatability.
+ compatibility.
* Docker: Added environment property.
Thanks Antoine Eiche.