Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Queue
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Terraform modules
- Incidents

Snippets Groups Projects

82309146

Commit 82309146 authored Nov 29, 2021 by Otto Visser

Downloads
- Plain Diff

Merge branch 516-lab-page-should-also-have-info-on-totals with...

Merge branch 516-lab-page-should-also-have-info-on-totals with refs/heads/development into refs/merge-requests/560/train

parents b31b7121 7620fbef

Branches

Tags

No related merge requests found

Changes 3

Show whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
src/main/java/nl/tudelft/queue/dto/view/labs/AbstractSlottedLabViewDTO.java 11 additions, 0 deletions

...udelft/queue/dto/view/labs/AbstractSlottedLabViewDTO.java
src/main/resources/templates/lab/view/components/slotted-lab-info.html 2 additions, 0 deletions

...urces/templates/lab/view/components/slotted-lab-info.html

with 14 additions and 0 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please sign in to comment