Skip to content
GitLab
Commit 1d809a34 authored by Alba Vilanova's avatar Alba Vilanova
Browse files

Merge branch 'master' into 'develop-10-create-nes-from-coordinates-options' 

# Conflicts:
#   nes/nc_projections/default_nes.py
parents cad6aa2b b736a939
Pipeline #7263 failed with stages
in 4 seconds
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