Merge pull request #38 from pytest-dev/maintain-2.1.x

RonnyPfannschmidt · web-flow · commit e91f456cce01 · 2022-05-09T07:02:16.000+02:00
reintegrate bugfix branch
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,10 @@
+2.1.1
+-----
+
+* drop the python 3.4 support marker, 2.1.0 broke it
+  2.1.0 will be yanked after release
+
+
 2.1.0
 ----------------------------------------
 

-Original file line number
+Diff line change
@@ @@ -1,3 +1,10 @@ @@
 +2.1.1
 +-----
++
 +* drop the python 3.4 support marker, 2.1.0 broke it
 +  2.1.0 will be yanked after release
++
++
 .1.0
 ----------------------------------------