Kristof De Langhe d2c2431c6c Merge branch 'master' into w2p-64503_Edit-collection-Content-Source-2 ...

Conflicts:
	resources/i18n/en.json5
	src/app/core/core.module.ts
	src/app/core/data/collection-data.service.ts
	src/app/shared/shared.module.ts

2020-01-06 11:48:44 +01:00

..

environment.default.js

Merge branch 'master' into w2p-64503_Edit-collection-Content-Source-2

2020-01-06 11:48:44 +01:00

environment.test.js

62589: test environment comment

2019-09-06 14:30:57 +02:00