Kristof De Langhe 2d3dfde6bb 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

2019-08-20 12:43:16 +02:00

..

environment.default.js

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

2019-08-20 12:43:16 +02:00

environment.test.js

have prod, test, and dev environment config files override default

2017-07-19 11:07:26 -05:00