Skip to content
Snippets Groups Projects
Commit 1c3897b1 authored by Hans Fangohr's avatar Hans Fangohr
Browse files

Merge branch 'linux-debian11' into 'towards-conventional-doc-strings' 

# Conflicts:
#   mpsd-software-environment.py
parents 865bb6f7 89b01a7e
No related branches found
No related tags found
2 merge requests!19Move linux-debian11 into main,!11Making docstrings comply with numpydoc
Pipeline #368340 passed
Stage: test
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment