Merge branch '1.1.x' into 2.0.x

This commit is contained in:
David Lord 2021-05-13 18:47:06 -07:00
commit 8648750997
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
2 changed files with 9 additions and 1 deletions

View file

@ -1448,7 +1448,6 @@ def test_static_url_empty_path_default(app):
rv.close()
@pytest.mark.skipif(sys.version_info < (3, 6), reason="requires Python >= 3.6")
def test_static_folder_with_pathlib_path(app):
from pathlib import Path