Skip to content
GitLab

Merge branch 'master' into 'v0.11.0-experiment' 

# Conflicts:
#   nomad/parsing/parsers.py
13 jobs for v0.11.0-experiment in 7 seconds (queued for 4 seconds)
d23b66a0
1 related merge request: !353 Restructured spectrum data for XPS parser