Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Team 14 - IDATT1002
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

6ac802aa

Commit 6ac802aa authored 5 years ago by Mads Lundegaard

Downloads
- Plain Diff

Merge branch 'image-album-model' into 'dev'

Image album model

See merge request !16

parents de26b4af d9816b66

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 5
Pipelines 3

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 8 additions, 8 deletions

pom.xml
src/main/java/NTNU/IDATT1002/models/Image.java 19 additions, 0 deletions

src/main/java/NTNU/IDATT1002/models/Image.java
src/main/java/NTNU/IDATT1002/models/ImageAlbum.java 112 additions, 0 deletions

src/main/java/NTNU/IDATT1002/models/ImageAlbum.java
src/main/java/NTNU/IDATT1002/models/User.java 32 additions, 0 deletions

src/main/java/NTNU/IDATT1002/models/User.java
src/main/resources/META-INF/persistence.xml 1 addition, 0 deletions

src/main/resources/META-INF/persistence.xml

with 172 additions and 8 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment