Skip to content
Commit 10119ca3 authored by Dominika Zemanovičová's avatar Dominika Zemanovičová
Browse files

Merge branch 'main' into 'Confidential-Client-Fix' 

# Conflicts:
#   application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/user/UserController.java
parents 582e0e11 ac222b07
Pipeline #231778 passed with stages
in 2 minutes and 35 seconds
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