Skip to content
Snippets Groups Projects
Birk Øvstetun Narvhus's avatar
Birk Øvstetun Narvhus authored
# Conflicts:
#   src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/GroupController.java
#   src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/GroupService.java
85277179
History
Name Last commit Last update