Skip to content
GitLab
Commit 10df66e4 authored by Kenneth Hoste's avatar Kenneth Hoste
Browse files

Merge branch 'develop' into graphviz_with_perl_binding 

Conflicts:
	easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.1-intel-2014b.eb
parents 6f033e65 375560c4
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