Kristof De Langhe 2e7c9f21b2 Merge branch 'configurable_entities' into mixing-text-authority-entities ...

Conflicts:
	src/app/+item-page/item-page.module.ts
	src/app/+item-page/simple/item-types/journal-issue/journal-issue.component.html

2019-02-05 09:45:57 +01:00

..

i18n

Merge branch 'configurable_entities' into mixing-text-authority-entities

2019-02-05 09:45:57 +01:00

images

Merge branch 'master' into configurable_entities

2019-01-21 14:26:47 -06:00