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

Merge branch 'v2.1' into v2.2

Conflicts:
	regtest/multicolvar/rt21/derivatives.reference
	regtest/multicolvar/rt21/plumed.dat
parents b2a0321b e02816d5
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment