Kristof De Langhe
authored
Conflicts: resources/i18n/en.json5 src/app/core/core.module.ts src/app/core/data/collection-data.service.spec.ts src/app/core/data/collection-data.service.ts src/app/core/data/request.models.ts src/app/shared/shared.module.ts