From b54ea74d4d0f1886c65a933f4c2215f224287cf1 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Mon, 22 Aug 2016 17:59:42 -0300 Subject: [PATCH] Update AUTHORS and CHANGELOG for #1837 --- AUTHORS | 1 + CHANGELOG.rst | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/AUTHORS b/AUTHORS index 40f77e0832d..b1e8f7f4c30 100644 --- a/AUTHORS +++ b/AUTHORS @@ -81,6 +81,7 @@ Lukas Bednar Maciek Fijalkowski Maho Marc Schlaich +Marcin Bachry Mark Abramowitz Markus Unterwaditzer Martijn Faassen diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 13c61c9239d..d571a2bf3db 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,11 +6,15 @@ * +* Fix loader error when running ``pytest`` embedded in a zipfile. + Thanks `@mbachry`_ for the PR. + * * +.. _@mbachry: https://github.com/mbachry .. _#1822: https://github.com/pytest-dev/pytest/issues/1822