Skip to content
Snippets Groups Projects
Commit de93a13f authored by Oriol Tintó's avatar Oriol Tintó
Browse files

Merge remote-tracking branch 'origin/FJ/spack_icon_install' into minimal-configuration

# Conflicts:
#	conf/real-from-ideal/proj.yaml
parents db6fabb3 3a87a92a
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment