Commit de6cee6f authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.4' into master-stretch

# Conflicts:
#	regtest/crystallization/rt-q6/colv.reference
parents 99d335e4 f3c7ce02
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment