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

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

Conflicts:
	lib/spack/spack/cmd/install.py
	lib/spack/spack/cmd/setup.py
parents dd56784d 8de143a9
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 781 additions and 245 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment