Skip to content
Snippets Groups Projects
Commit 4f41d979 authored by Jan Hönig's avatar Jan Hönig
Browse files

Merge branch 'develop' into 'master' 

Update conftest and readme

See merge request !167
parents 2d758462 458bff59
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment