Skip to content
Commit ab5c7d60 authored by Martin Hesko's avatar Martin Hesko
Browse files

Merge branch 'dev' into 'milestone-2-sellwine' 

# Conflicts:
#   winery/dto/src/main/java/org/delta/dto/entities/bottle/BottleListEntityDTO.java
#   winery/dto/src/main/java/org/delta/dto/entities/bottle/UpdateBottleDTO.java
parents 7957f3a7 c4af72a3
Hide whitespace changes
Inline Side-by-side
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