Skip to content
Snippets Groups Projects
Commit cfcc13b1 authored by Stian Lyng Stræte's avatar Stian Lyng Stræte
Browse files

Merge branch 'main' into 'feature/59-change-existing-repositories-to-jpa' 

# Conflicts:
#   src/main/java/ntnu/idatt2016/v233/SmartMat/repository/RecipeRepository.java
#   src/main/java/ntnu/idatt2016/v233/SmartMat/repository/ShoppingListRepository.java
parents f3714357 6dc30e01
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 169 additions and 52 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment