4Science / dspace-angular / 65 / 1

56%

master: 80%

push

travis-ci

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

# Conflicts:
#	resources/i18n/en.json
#	src/app/shared/chips/chips.component.html
#	src/app/shared/chips/models/chips-item.model.ts
#	src/app/shared/chips/models/chips.model.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.components.ts

1334 of 3408 branches covered (39.14%)

Branch coverage included in aggregate %.

5895 of 9970 relevant lines covered (59.13%)

8.27 hits per line