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

..

cs.json

flatten i18n files

2019-07-26 11:09:06 +02:00

de.json

flatten i18n files

2019-07-26 11:09:06 +02:00

en.json

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

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

nl.json

flatten i18n files

2019-07-26 11:09:06 +02:00