From ca8d3c6c18d314a7314e383b53472127e00a523f Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 20 Mar 2018 14:55:44 +0100
Subject: [PATCH] Bump 1.20.0

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 CHANGELOG.md        | 2 ++
 compose/__init__.py | 2 +-
 script/run/run.sh   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c113572ca..ab0a2c354 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -86,6 +86,8 @@ Change log
 - Fixed a bug occurring during builds caused by files with a negative `mtime`
   values in the build context
 
+- Fixed an encoding bug when streaming build progress
+
 1.19.0 (2018-02-07)
 -------------------
 
diff --git a/compose/__init__.py b/compose/__init__.py
index d2e3f696b..1c5a409f1 100644
--- a/compose/__init__.py
+++ b/compose/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-__version__ = '1.20.0-rc2'
+__version__ = '1.20.0'
diff --git a/script/run/run.sh b/script/run/run.sh
index dff9d982a..a739edb35 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.20.0-rc2"
+VERSION="1.20.0"
 IMAGE="docker/compose:$VERSION"