Skip to content
Snippets Groups Projects
Commit 4c8f9f82 authored by Kristof De Langhe's avatar Kristof De Langhe
Browse files

Merge branch 'master' into w2p-66156_Display-of-relations

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
parents ac58297c d8dd045a
No related branches found
No related tags found
No related merge requests found
Showing
with 198 additions and 347 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