Skip to content
Snippets Groups Projects
Commit 2e3b3411 authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.1' into v2.2 

Conflicts:
	src/maketools/update-plumedroot.sh
	user-doc/Installation.txt
parents 4e78fa71 b22ed559
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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