Skip to content
Snippets Groups Projects
Commit 85277179 authored by Birk Øvstetun Narvhus's avatar Birk Øvstetun Narvhus
Browse files

Merge branch 'main' into 'feature/205-can-delete-item-from-fridge' 

# Conflicts:
#   src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/GroupController.java
#   src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/GroupService.java
parents c7d2977f d9b482db
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment