Merge remote-tracking branch 'upstream/master' into ethanhs/silencenodes

This commit is contained in:
Bruno Oliveira
2018-12-11 14:35:25 -02:00
7 changed files with 22 additions and 12 deletions

1
changelog/378.bugfix.rst Normal file
View File

@@ -0,0 +1 @@
Fix support for gevent monkeypatching

1
changelog/384.bugfix.rst Normal file
View File

@@ -0,0 +1 @@
Add support for pytest 4.1.