Update AUTHORS and CHANGELOG for #1837

pytest-dev · Aug 22, 2016 · b54ea74 · b54ea74
1 parent 6a8160b
commit b54ea74
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git 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
@@ -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