Skip to content
Snippets Groups Projects
Commit 5f7e4057 authored by Eirik Steira's avatar Eirik Steira
Browse files

Merge branch 'dev' into 'load-database' 

# Conflicts:
#   src/main/java/NTNU/IDATT1002/models/User.java
#   src/main/java/NTNU/IDATT1002/service/ImageAlbumService.java
parents 5ba02b2f 521ce412
No related branches found
No related tags found
2 merge requests!104Weekly merge to Master,!68Add LoadDatabase to load test data into the database
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 436 additions and 344 deletions
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