Commit 60b9d4db authored by Joan Solà Ortega's avatar Joan Solà Ortega
Browse files

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	yaml/csm.yaml
parents db38f9cf 19d0917a
Pipeline #10164 failed with stage
in 17 minutes and 46 seconds