Skip to content
Snippets Groups Projects
Commit 6d977250 authored by Moritz Huebner's avatar Moritz Huebner
Browse files

Merge branch 'master' into '207-pep8-imports'

# Conflicts:
#   bilby/core/sampler/base_sampler.py
parents 192d82d2 349d7f1a
No related branches found
No related tags found
No related merge requests found
Showing with 493 additions and 165 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