Skip to content
Snippets Groups Projects
Commit b64c91c0 authored by paf's avatar paf
Browse files

Merge remote-tracking branch 'testcenter-admin/master'

# Conflicts: (some are resolved directly, most are split into TC and ADMIN version)
#	.gitignore
#	README.md
#	angular.json
#	e2e/src/app.e2e-spec.ts
#	package-lock.json
#	package.json
#	src/app/about/about.component.html
#	src/app/about/about.component.ts
#	src/app/app-routing.module.ts
#	src/app/app.component.scss
#	src/app/app.component.spec.ts
#	src/app/app.component.ts
#	src/app/app.interceptor.ts
#	src/app/app.interfaces.ts
#	src/app/app.module.ts
#	src/app/backend.service.ts
#	src/app/maindata.service.spec.ts
#	src/app/maindata.service.ts
#	src/app/start/start.component.css
#	src/app/start/start.component.html
#	src/app/start/start.component.spec.ts
#	src/app/start/start.component.ts
#	src/app/superadmin/superadmin-routing.module.ts
#	src/app/superadmin/superadmin.component.css
#	src/app/superadmin/superadmin.component.html
#	src/app/superadmin/superadmin.component.ts
#	src/app/superadmin/superadmin.module.ts
#	src/environments/environment.build.ts
#	src/environments/environment.prod.ts
#	src/environments/environment.ts
#	src/index.html
#	src/polyfills.ts
#	src/styles.css
#	src/tsconfig.app.json
#	src/tsconfig.spec.json
#	src/tslint.json
#	tsconfig.json
#	tslint.json
parents 8cd1409a 3efeaeea
No related branches found
No related tags found
No related merge requests found
Showing
with 1089 additions and 897 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment