4Science / dspace-angular / 551 / 1

79%

master: 80%

push

travis-ci

Merge remote-tracking branch 'remotes/origin/master' into dspace-cris-7

# Conflicts:
#	src/app/core/core.module.ts
#	src/app/core/data/base-response-parsing.service.ts
#	src/app/core/integration/integration-response-parsing.service.ts
#	src/app/shared/shared.module.ts

5583 of 7911 branches covered (70.57%)

Branch coverage included in aggregate %.

13121 of 15589 relevant lines covered (84.17%)

19.48 hits per line