Skip to content
Snippets Groups Projects
Commit 402dbadb authored by Hugo SUBTIL's avatar Hugo SUBTIL
Browse files

Merge branch 'dev' into 'feat/add-brignais-to-carto'

# Conflicts:
#   src/app/map/components/map.component.ts
parents b329468f f9d99010
No related branches found
No related tags found
3 merge requests!68Recette,!67Dev,!58feat: add geojson for metropole and brignais
Showing
with 65 additions and 78 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment