Commit c5296651 authored by Nuria Pérez-Zanón's avatar Nuria Pérez-Zanón
Browse files

Merge branch 'dev-NAO' into 'dev-Saving_point_data'

# Conflicts:
#   conf/archive.yml
#   conf/output_dictionaries/scorecards.yml
parents 556bdb1d 0704a25d
Pipeline #9627 failed with stage
in 36 seconds