Kristof De Langhe b2ef5ee2fa Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates ...

Conflicts:
	package.json
	resources/i18n/en.json5
	src/app/+item-page/item-page.module.ts
	src/app/core/core.module.ts
	src/app/core/data/bundle-data.service.ts
	src/app/core/data/data.service.spec.ts
	src/app/core/data/data.service.ts
	src/app/core/data/item-data.service.ts
	src/app/core/data/object-updates/object-updates.service.ts
	src/app/core/shared/hal-endpoint.service.ts
	src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
	src/app/shared/mocks/mock-request.service.ts
	src/app/shared/shared.module.ts
	src/app/shared/trackable/abstract-trackable.component.ts
	yarn.lock

2020-01-24 14:21:20 +01:00

..

fonts

remove version number

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

i18n

Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates

2020-01-24 14:21:20 +01:00

images

added banner and changed fonts

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