Commit 4df29f1d authored by Colm Talbot's avatar Colm Talbot

Merge branch 'master' into 'change_sampled_parameters'

# Conflicts:
#   tupak/sampler.py
parents 3f734cc2 469c5ee5
Pipeline #19458 passed with stages
in 5 minutes and 54 seconds