Commit 27dd7c0c authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Merge remote-tracking branch 'origin/master' into master

# Conflicts:
#	HISTORY.rst
#	py_tools_ds/version.py
parents 91f34185 ee8e5a38
Pipeline #11749 canceled with stages