Skip to content
GitLab
Commit 5338bbe5 authored by Kenneth Hoste's avatar Kenneth Hoste
Browse files

Merge branch 'develop' into OpenFOAM-2.2.0 

Conflicts:
	easybuild/easyconfigs/f/flex/flex-2.5.35-ictce-5.3.0.eb
	easybuild/easyconfigs/f/flex/flex-2.5.37-ictce-5.3.0.eb
	test/easyconfigs/easyconfigs.py
parents e6515dd9 61f6af1e
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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