src/environments/environment.dev.ts · 58d18efd2b4b4fad3e3853387d37be8ef672c89a · IQB / discontinued / testcenter-frontend

4 years ago

Merge branch 'master' into group-monitor-active · 9c4b31dc

mechtelm authored 4 years ago

# Conflicts:
#	src/app/test-controller/command.service.ts
#	src/app/test-controller/focus.service.ts
#	src/app/test-controller/test-controller.component.html
#	src/app/test-controller/test-controller.component.ts
#	src/app/test-controller/test-controller.module.ts
#	src/app/test-controller/test-controller.service.ts

9c4b31dc

History

Merge branch 'master' into group-monitor-active

mechtelm authored 4 years ago

# Conflicts:
#	src/app/test-controller/command.service.ts
#	src/app/test-controller/focus.service.ts
#	src/app/test-controller/test-controller.component.html
#	src/app/test-controller/test-controller.component.ts
#	src/app/test-controller/test-controller.module.ts
#	src/app/test-controller/test-controller.service.ts

Code owners

Assign users and groups as approvers for specific file changes. Learn more.