Kristof De Langhe 2f0a5a4065 Merge branch 'master' into w2p-62589_Item-mapper-update ...

Conflicts:
	resources/i18n/en.json
	src/app/+search-page/search-service/search.service.ts
	src/app/core/core.module.ts

2019-08-12 15:23:43 +02:00

..

i18n

Merge branch 'master' into w2p-62589_Item-mapper-update

2019-08-12 15:23:43 +02:00

images

added banner and changed fonts

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