4Science / dspace-angular / 534

36%

master: 80%

push

travis-ci

Merge remote-tracking branch 'remotes/origin/hasselt_dev_angular6' into hasselt_dev

# Conflicts:
#	config/environment.default.js
#	resources/i18n/en.json
#	src/app/+login-page/login-page.component.ts
#	src/app/app-routing.module.ts
#	src/app/core/auth/auth.effects.ts
#	src/app/core/auth/auth.service.ts
#	src/app/core/auth/models/normalized-auth-status.model.ts
#	src/app/core/data/collection-data.service.ts
#	src/app/core/services/server-response.service.ts
#	src/app/core/shared/item.model.ts
#	src/app/pagenotfound/pagenotfound.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
#	src/app/submission/form/collection/submission-form-collection.component.ts
#	src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
#	src/styles/_bootstrap_variables.scss
#	webpack/webpack.common.js

2845 of 7943 branches covered (35.82%)

Branch coverage included in aggregate %.

5588 of 15635 relevant lines covered (35.74%)

2.15 hits per line