Merge branch 'master' into purge-pew

pypa · Jul 4, 2018 · 61cb7a3 · 61cb7a3
2 parents 1b59a4d + fcbda18
commit 61cb7a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -146,3 +146,4 @@ venv.bak/
 # End of https://www.gitignore.io/api/python,macos
 
 # Custom rules (everything added below won't be overriden by 'Generate .gitignore File' if you use 'Update' option)
+.vs/slnx.sqlite
diff --git a/pytest.ini b/pytest.ini
@@ -1,2 +1,3 @@
 [pytest]
+addopts = -n auto
 norecursedirs = vendor patched
Original file line number	Diff line number	Diff line change
Expand Up		@@ -146,3 +146,4 @@ venv.bak/
		# End of https://www.gitignore.io/api/python,macos

		# Custom rules (everything added below won't be overriden by 'Generate .gitignore File' if you use 'Update' option)
		.vs/slnx.sqlite