Skip to content
Commit 638b95d7 authored by Fang Yuedong's avatar Fang Yuedong
Browse files

Merge branch 'release_v3.0' into 'master' 

# Conflicts:
#   observation_sim/mock_objects/Galaxy.py
#   observation_sim/mock_objects/MockObject.py
#   observation_sim/psf/PSFInterpSLS.py
parents 570a35a4 d8118d46
Expand all Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment