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

Merge branch 'develop' of https://github.com/LLNL/spack into qa/coding_standard

Conflicts:
	.travis.yml
parents 4b22c240 e32eb7e9
No related branches found
No related tags found
No related merge requests found
Showing
with 507 additions and 160 deletions
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