Commit dd4bf68c authored by Dennis Willers's avatar Dennis Willers 🏀

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.gitlab-ci.yml
#	Dockerfile
parents 791d05f5 f971b61d
Pipeline #323 passed with stages
in 3 minutes and 1 second