Kristof De Langhe a1ac80e53a Merge branch 'master' into w2p-64961_Edit-bitstream-page ...

Conflicts:
	src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
	src/app/+item-page/edit-item-page/edit-item-page.module.ts
	src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts
	src/app/app-routing.module.ts
	src/app/shared/shared.module.ts

2019-09-12 13:21:08 +02:00

..

i18n

Merge branch 'master' into w2p-64961_Edit-bitstream-page

2019-09-12 13:21:08 +02:00

images

added banner and changed fonts

2019-05-14 11:39:56 +02:00