Skip to content
Snippets Groups Projects
Commit 78ae5d77 authored by Massimiliano Culpo's avatar Massimiliano Culpo
Browse files

Merge branch 'develop' of https://github.com/LLNL/spack into features/custom_modulefile_from_config

Conflicts:
	lib/spack/spack/config.py
parents 22bb0562 3d3a520a
Branches
Tags
No related merge requests found
Showing
with 348 additions and 44 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment