Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

B

backend
- Activity
- Members
- Wiki
- Terraform modules

Snippets Groups Projects

64334d5d

Commit 64334d5d authored 2 years ago by Birk Øvstetun Narvhus

Downloads
- Plain Diff

Merge branch 'Epic/1-product-endpoint' into 'main'

hot fixed product frige asso and product, to fix json mappign

See merge request idatt2106-v23-03/backend!117

parents 4f34320f 8ba757e6

Branches ResetPassword

No related tags found

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/ntnu/idatt2016/v233/SmartMat/entity/fridgeProduct/FridgeProductAsso.java 3 additions, 0 deletions

...v233/SmartMat/entity/fridgeProduct/FridgeProductAsso.java
src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Product.java 9 additions, 1 deletion

.../ntnu/idatt2016/v233/SmartMat/entity/product/Product.java

with 12 additions and 1 deletion

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