Skip to content
Snippets Groups Projects
Commit eac5426b authored by Moritz Huebner's avatar 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 6b49b514
No related branches found
No related tags found
No related merge requests found
Showing
with 1318 additions and 245 deletions
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