Skip to content
Find file Blame History Permalink
  • Marek Kadlečík's avatar
    Merge branch 'main' into 'security' · a9478aa1
    Marek Kadlečík authored 
    # 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
    a9478aa1