Skip to content
Snippets Groups Projects
  • Kristof De Langhe's avatar
    Merge branch 'master' into w2p-66156_Display-of-relations · 4c8f9f82
    Kristof De Langhe authored
    Conflicts:
    	resources/i18n/en.json5
    	src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
    	src/app/entity-groups/research-entities/item-pages/person/person.component.html
    	themes/mantis/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
    	themes/mantis/app/entity-groups/research-entities/item-pages/person/person.component.html
    4c8f9f82