Kristof De Langhe 97de2b8ef3 Merge branch 'master' into w2p-63669_Edit-Col/Com-Tabs ...

Conflicts:
	resources/i18n/en.json
	src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts
	src/app/shared/shared.module.ts

2019-10-03 13:46:11 +02:00

..

i18n

Merge branch 'master' into w2p-63669_Edit-Col/Com-Tabs

2019-10-03 13:46:11 +02:00

images

added banner and changed fonts

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