Commit f0eafff3 authored by Ondřej Pavlica's avatar Ondřej Pavlica
Browse files

Merge branch 'main' of

# Conflicts:
#	winery/webapp/src/main/java/cz/muni/fi/pa165/winery/webapp/models/grape/
#	winery/webapp/src/main/java/cz/muni/fi/pa165/winery/webapp/models/wineBottle/
#	winery/webapp/src/main/java/cz/muni/fi/pa165/winery/webapp/models/wineType/
parents d3857b9b bf355673
Pipeline #141201 passed with stages
in 2 minutes and 29 seconds
Supports Markdown
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