4Science / dspace-angular / 71 / 2

56%

master: 80%

push

travis-ci

Merge remote-tracking branch 'remotes/origin/dynamic_forms' into dspacecris_dev

# Conflicts:
#	resources/i18n/en.json
#	src/app/core/cache/response-cache.models.ts
#	src/app/core/core.module.ts
#	src/app/core/data/request.models.ts
#	src/app/shared/pagination/pagination.component.ts
#	src/app/shared/shared.module.ts
#	src/styles/_custom_variables.scss

1348 of 3428 branches covered (39.32%)

Branch coverage included in aggregate %.

6108 of 10223 relevant lines covered (59.75%)

8.67 hits per line