RADAR-CNS / RADAR-Dashboard / 1746 / 1

82%

master: 79%

push

travis-ci

Merge remote-tracking branch 'origin/feature/adjust-time-frame' into feature/adjust-time-frame

# Conflicts:
#	src/app/charts/chart-base/chart-base.component.ts
#	src/app/shared/enums/time-window.enum.ts
#	src/app/shared/testing/mocks/mock-sources.ts
#	src/app/subject/store/volume-data/volume-data.effects.ts

164 of 339 branches covered (48.38%)

1195 of 1465 relevant lines covered (81.57%)

4.72 hits per line