Skip to content
Snippets Groups Projects
Commit 54c7f1af authored by Otto Visser's avatar Otto Visser
Browse files

Merge branch 'development' into 'room-updates' 

# Conflicts:
#   src/main/java/nl/tudelft/ewi/queue/controller/AdminController.java
#   src/main/java/nl/tudelft/ewi/queue/service/AdminService.java
parents 3898c6ad 4563767c
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 110 additions and 127 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment