Skip to content
GitLab
Commit 2511fed2 authored by Javier Vegas-Regidor's avatar Javier Vegas-Regidor
Browse files

Merge branch 'devel-primavera' 

# Conflicts:
#	diags.conf
#	earthdiagnostics/earthdiags.py
#	earthdiagnostics/general/simplify_dimensions.py
parents 0f89f83c d12eb89f
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment