Skip to content
Commit 14e11bdc authored by Jonas Schüppen's avatar Jonas Schüppen
Browse files

Merge branch 'styles_adjustment' into newfeatures_adjustment 

# Conflicts:
#	.gitlab-ci.yml
#	generateBaseline/postprocessing.py
#	generateBaseline/postprocessing_styling.py
#	generateBaseline/setup.py
parents 7f4fac29 12f85914
Expand all 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