# Conflicts:
#   src/app/mapping/mapping.component.html

Feature/mapping from iso19115

See merge request !26

Feature/geodcat

See merge request !27

Fix/from uc2

See merge request !28

Merge branch 'master' of https://git.garr.it/eosc-pillar/ffds/ffds-register-front into feature/geodcat

Feature/geodcat

See merge request !25

Merge branch 'master' of https://git.garr.it/eosc-pillar/ffds/ffds-register-front into feature/geodcat

fix vocabulary duplication bug

See merge request !24

Merge branch 'master' of https://git.garr.it/eosc-pillar/ffds/ffds-register-front into feature/geodcat

fix mapping template

See merge request !23