Skip to content
Snippets Groups Projects
Commit 8cac6efc authored by Anders Austlid's avatar Anders Austlid
Browse files

Merge remote-tracking branch 'origin/main' into bugfix/fix-tests

# Conflicts:
#	src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/FridgeService.java
parents ac71a377 156d79a7
No related branches found
No related tags found
No related merge requests found
Showing
with 182 additions and 62 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