Commits

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

Conflicts:
	config/environment.default.js
	resources/i18n/en.json
	src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts
	src/config/global-config.interface.ts
99591765755

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut