Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

I

idatt1002_2022_K1-G4
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

0fb4c0f8

Commit 0fb4c0f8 authored 3 years ago by Eilert Werner Hansen

Downloads
- Plain Diff

Merge branch 'main' into feat/create-match-button

parents 43e6b669 b910bc22

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/edu/ntnu/idatt1002/k1g4/client/Model.java 7 additions, 5 deletions

src/main/java/edu/ntnu/idatt1002/k1g4/client/Model.java
src/main/java/edu/ntnu/idatt1002/k1g4/client/controllers/CupOverviewController.java 33 additions, 12 deletions

...tt1002/k1g4/client/controllers/CupOverviewController.java
src/main/java/edu/ntnu/idatt1002/k1g4/client/controllers/HomeController.java 107 additions, 52 deletions

...tnu/idatt1002/k1g4/client/controllers/HomeController.java
src/main/resources/home.fxml 25 additions, 4 deletions

src/main/resources/home.fxml

with 172 additions and 73 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