Skip to content
Snippets Groups Projects
Commit 8a680bf9 authored by Henrik Teksle Sandok's avatar Henrik Teksle Sandok
Browse files

Merge branch 'master' into 'feat/get-streak-and-point-in-profile-dto'

# Conflicts:
#   src/main/java/no/ntnu/idi/stud/savingsapp/dto/user/UserDTO.java
parents 203d0003 78464e78
No related branches found
No related tags found
1 merge request!81feat: add streak and point to profile dto
Pipeline #283209 passed
......@@ -3,6 +3,7 @@ package no.ntnu.idi.stud.savingsapp.dto.user;
import lombok.Data;
import java.sql.Timestamp;
import no.ntnu.idi.stud.savingsapp.bank.model.Account;
@Data
public class UserDTO {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment