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

Merge remote-tracking branch 'origin/feature/balga/users'

# Conflicts:
#	winery/webapp/src/main/resources/templates/fragments/header.html
parents 0b08e219 ad2909b0
Pipeline #138137 passed with stages
in 2 minutes and 59 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