Skip to content
Snippets Groups Projects
Commit fd9a40aa authored by Gregory Ashton's avatar Gregory Ashton Committed by Moritz Huebner
Browse files

Merge remote-tracking branch 'origin/master' into 245-proposal-library 

# Conflicts:
#	bilby/core/sampler/cpnest.py
#	examples/injection_examples/fast_tutorial.py
parent ce26c675
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment