Update AUTHORS and CHANGELOG for #1837

2016-08-22 17:59:42 -03:00
parent 6a8160b318
commit b54ea74d4d
2 changed files with 5 additions and 0 deletions
--- a/1
+++ b/1
@@ -81,6 +81,7 @@ Lukas Bednar
 Maciek Fijalkowski
 Maho
 Marc Schlaich
+Marcin Bachry
 Mark Abramowitz
 Markus Unterwaditzer
 Martijn Faassen
--- 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