Skip to content
Snippets Groups Projects
Commit fae61a30 authored by baigner's avatar baigner
Browse files

Merge branch 'master' into dev_vistoms_try_Benedikt 

# Conflicts:
#	kadmos/vistoms/vistoms.py

--> Used version from dev_vistoms_try_Benedikt since they are up to date!


Former-commit-id: 118ac9dcedcc88c939736a1bca84459158d6b513
parents 9897975f d0de00d9
No related branches found
No related tags found
No related merge requests found
Pipeline #192862 canceled
Stage: build
Stage: test
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 424 additions and 239 deletions
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