Kristof De Langhe 07c8c593ec Merge branch 'master' into w2p-65272_Edit-collection-item-template ...

Conflicts:
	src/app/+collection-page/collection-page-routing.module.ts
	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/core/cache/server-sync-buffer.effects.ts
	src/app/core/core.module.ts
	src/app/core/data/data.service.ts
	src/app/core/data/dso-change-analyzer.service.ts
	src/app/core/data/object-updates/object-updates.service.ts

2020-05-04 16:36:46 +02:00

..

fonts

remove version number

2019-11-27 13:48:06 +01:00

i18n

Merge branch 'master' into w2p-65272_Edit-collection-item-template

2020-05-04 16:36:46 +02:00

images

added banner and changed fonts

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