Skip to content
Snippets Groups Projects
Commit 61c9c3bf authored by Colm Talbot's avatar Colm Talbot
Browse files

Merge branch 'master' into 'generate_component_source_masses' 

# Conflicts:
#   bilby/core/result.py
#   bilby/core/utils/cmd.py
#   bilby/core/utils/introspection.py
#   bilby/gw/source.py
#   test/check_author_list.py
parents 77de5037 272a670b
No related branches found
No related tags found
1 merge request!1131Added 'source' flag to generate_component_masses and generate_mass_parameters
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1415 additions and 980 deletions
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