Commit 53e3e7fb authored by Simon Conseil's avatar Simon Conseil

Merge branch 'combine' into 'master'

Allow to correct zero offset in mpdaf_merging_sigma_clipping

See merge request !163
parents 6a6166f1 279f97a2
Pipeline #3149 passed with stage
in 21 minutes and 21 seconds