Skip to content
Commit a63653c2 authored by Alexandra Skyslakova's avatar Alexandra Skyslakova
Browse files

Merge remote-tracking branch 'origin/add-auth-swagger' into showcase 

# Conflicts:
#	certificate/src/main/java/cz/muni/fi/certificate/SecurityConfig.java
parents 40069f6f e0a8be14
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment