Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

teknikattan-scoring-system
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

9e24180b

Commit 9e24180b authored 3 years ago by Albin Henriksson

Downloads
- Plain Diff

Merge branch 'dev' of...

Merge branch 'dev' of https://gitlab.liu.se/tddd96-grupp11/teknikattan-scoring-system into 187-disable-timer-when-info-slide

parents c71e7275 6afcf518

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

client/src/pages/presentationEditor/components/Teams.tsx 47 additions, 27 deletions

client/src/pages/presentationEditor/components/Teams.tsx
client/src/pages/views/OperatorViewPage.tsx 25 additions, 19 deletions

client/src/pages/views/OperatorViewPage.tsx
client/src/pages/views/components/Timer.tsx 1 addition, 1 deletion

client/src/pages/views/components/Timer.tsx

with 73 additions and 47 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 sign in to comment