Merge master into merge-master-into-features

2018-11-24 13:47:10 +01:00
parent 33b877cc01 8facf1db90
commit 5bee396e4b
4 changed files with 9 additions and 11 deletions
--- a/changelog/4435.bugfix.rst
+++ b/changelog/4435.bugfix.rst
@@ -0,0 +1 @@
+Fix ``raises(..., 'code(string)')`` frame filename.
				`@@ -0,0 +1 @@`
				Fix ``raises(..., 'code(string)')`` frame filename.