Commit c9e62798 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Merge branch 'master' into bugfix/fix_ci_connection

# Conflicts:
#	.gitlab-ci.yml
#	HISTORY.rst
#	py_tools_ds/version.py
parents d0bcfd00 0117d611
Pipeline #12220 passed with stage
in 21 seconds