Skip to content
Commit 31270bd9 authored by Andreas Irrgang's avatar Andreas Irrgang
Browse files

Merge branch 'master' into 'filter_passbands' 

# Conflicts:
#   src/plotting/xfig_photometry.sl
parents ca98e575 09c9a874
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment