Merge master into features (#6346)

Merge master into features
2019-12-16 21:57:26 -03:00
parent c487cf9dd5 853889e5db
commit 75493f78bf
16 changed files with 186 additions and 24 deletions
@@ -1 +0,0 @@
-The supporting files in the ``.pytest_cache`` directory are kept with ``--cache-clear``, which only clears cached values now.
				`@@ -1 +0,0 @@`
				The supporting files in the ``.pytest_cache`` directory are kept with ``--cache-clear``, which only clears cached values now.