Skip to content
Commit a9478aa1 authored by Marek Kadlečík's avatar Marek Kadlečík
Browse files

Merge branch 'main' into 'security' 

# Conflicts:
#   gaming-sample-data/src/main/java/cz/muni/fi/pa165/sampledata/SampleDataLoadingFacadeImpl.java
#   gaming-spring-mvc/src/main/webapp/WEB-INF/tags/pagetemplate.tag
parents 2575a085 e682f12b
Pipeline #141826 passed with stage
in 1 minute and 6 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