Skip to content
Commit 69b1d6c3 authored by Petr Wehrenberg's avatar Petr Wehrenberg
Browse files

Merge remote-tracking branch 'origin/feat/oauth2-okta' into feat/oauth2-okta 

# Conflicts:
#	module-user/src/main/java/cz/muni/fi/pa165/config/SecurityConfiguration.java
#	module-user/src/main/resources/application.yml
parents c94558ae 8e3d43f1
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