Skip to content

Commit 2be890d

Browse files
authored
Merge branch 'master' into schneems/check-changelog-fix-escaping
2 parents 3096299 + ffc7359 commit 2be890d

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
# Master
44

5+
- Typo fixes
6+
57
--------------------------------------------------------------------------------
68

79
# 156 (2019-09-12)

bin/steps/pip-uninstall

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
1313

1414

1515
if ! pip-diff --stale requirements-declared.txt requirements.txt --exclude setuptools pip wheel > .heroku/python/requirements-stale.txt; then
16-
mount "failure.bad-requirements"
16+
mcount "failure.bad-requirements"
1717
fi
1818

1919
rm -fr requirements-declared.txt

builds/heroku-18.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM heroku/heroku:18-build
1+
FROM heroku/heroku:18-build.v16
22

33
WORKDIR /app
44
ENV WORKSPACE_DIR="/app/builds" \

0 commit comments

Comments
 (0)