Skip to content
Commit e46aca3c authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Merge branch 'master' into 'master' 

"pytest-6.0.0" <=> "pylint-2.5.3" incompat

See merge request inducer/ci-support!27
parents fc8c4b77 e559408a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment