Kristof De Langhe 0390f67d01 Merge branch 'master' into w2p-62372_Final-master-merge ...

Conflicts:
	config/environment.default.js
	resources/i18n/en.json
	src/app/+search-page/paginated-search-options.model.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.spec.ts
	src/app/+search-page/search-options.model.ts
	src/app/+search-page/search-page.component.spec.ts
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-page.module.ts
	src/app/+search-page/search-service/search-configuration.service.ts
	src/app/core/cache/response.models.ts
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts
	src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
	src/app/shared/object-list/wrapper-list-element/wrapper-list-element.component.ts
	src/app/shared/services/route.service.ts

2019-05-13 12:47:21 +02:00

..

i18n

Merge branch 'master' into w2p-62372_Final-master-merge

2019-05-13 12:47:21 +02:00

images

replace placeholder images with more consistent, scalable ones

2019-04-30 16:04:02 +02:00