Commit 8eb9e2e9 authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.1' into v2.2 

Conflicts:
	src/multicolvar/MultiColvar.cpp
parents 66944c87 1a1222f4
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment