Merge branch 'release'

Signed-off-by: Joffrey F <[email protected]>

CHANGELOG.md

@@ -1,6 +1,14 @@
 Change log
 ==========
 
+1.20.1 (2018-03-21)
+-------------------
+
+### Bugfixes
+
+- Fixed an issue where `docker-compose build` would error out if the
+  build context contained directory symlinks
+
 1.20.0 (2018-03-20)
 -------------------
 

script/run/run.sh

@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.20.0"
+VERSION="1.20.1"
 IMAGE="docker/compose:$VERSION"