Commit 77eb2c3a authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.1' 

[makedoc]

Conflicts:
	src/bias/MetaD.cpp
parents a4c6445e d6e6b3bf
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