Skip to content

Commit 35fe98b

Browse files
Merge remote-tracking branch 'origin/main'
# Conflicts: # README.md # backend/checkstyle.xml # backend/kendo-tournament-core/pom.xml # backend/kendo-tournament-core/src/test/java/com/softwaremagico/kt/core/tests/achievements/SithKillsMasterAchievementsTest.java # backend/kendo-tournament-core/src/test/resources/ehcache.xml # backend/kendo-tournament-core/src/test/resources/logback.xml # backend/kendo-tournament-logger/pom.xml # backend/kendo-tournament-pdf/pom.xml # backend/kendo-tournament-pdf/src/test/resources/logback.xml # backend/kendo-tournament-persistence/pom.xml # backend/kendo-tournament-persistence/src/main/java/com/softwaremagico/kt/utils/NameUtils.java # backend/kendo-tournament-persistence/src/test/resources/ehcache.xml # backend/kendo-tournament-persistence/src/test/resources/logback.xml # backend/kendo-tournament-rest/pom.xml # backend/kendo-tournament-rest/src/main/java/com/softwaremagico/kt/rest/security/WebSecurityConfig.java # backend/kendo-tournament-rest/src/main/resources/ehcache.xml # backend/kendo-tournament-rest/src/main/resources/logback.xml # backend/kendo-tournament-rest/src/test/java/com/softwaremagico/kt/rest/ParticipantAccessTests.java # backend/kendo-tournament-rest/src/test/java/com/softwaremagico/kt/security/BruteForceTests.java # backend/kendo-tournament-rest/src/test/java/com/softwaremagico/kt/security/TestAuthApi.java # backend/kendo-tournament-rest/src/test/resources/ehcache.xml # backend/kendo-tournament-rest/src/test/resources/logback.xml # backend/kendo-tournament-rest/src/test/resources/testng.xml # backend/pom.xml # documents/achievement.svg # documents/logo.svg # frontend/src/app/app.component.html # frontend/src/app/components/fight/duel/draw/draw.component.html # frontend/src/app/components/fight/duel/user-score/fault/fault.component.html # frontend/src/app/components/fight/duel/user-score/score/score.component.html # frontend/src/app/components/fight/duel/user-score/user-name/user-name.component.html # frontend/src/app/views/participant-statistics/participant-statistics.component.html # frontend/src/app/views/tournament-statistics/tournament-statistics.component.html # frontend/src/assets/achievements/a_little_of_everything.svg # frontend/src/assets/achievements/billy_the_kid.svg # frontend/src/assets/achievements/bone_breaker.svg # frontend/src/assets/achievements/daruma.svg # frontend/src/assets/achievements/default.svg # frontend/src/assets/achievements/dethrone_the_king.svg # frontend/src/assets/achievements/entrenched.svg # frontend/src/assets/achievements/flexible_as_bamboo.svg # frontend/src/assets/achievements/i_love_the_flags.svg # frontend/src/assets/achievements/juggernaut.svg # frontend/src/assets/achievements/lethal_weapon.svg # frontend/src/assets/achievements/looks_good_from_far_away_but.svg # frontend/src/assets/achievements/love_sharing.svg # frontend/src/assets/achievements/master_the_loop.svg # frontend/src/assets/achievements/sith_apprentices_always_kill_their_master.svg # frontend/src/assets/achievements/stormtrooper_syndrome.svg # frontend/src/assets/achievements/sweaty_tenugui.svg # frontend/src/assets/achievements/terminator.svg # frontend/src/assets/achievements/the_castle.svg # frontend/src/assets/achievements/the_king.svg # frontend/src/assets/achievements/the_never_ending_story.svg # frontend/src/assets/achievements/the_rock.svg # frontend/src/assets/achievements/the_tower.svg # frontend/src/assets/achievements/the_winner.svg # frontend/src/assets/achievements/the_winner_team.svg # frontend/src/assets/achievements/tis_but_a_scratch.svg # frontend/src/assets/achievements/v_for_vendetta.svg # frontend/src/assets/achievements/woodcutter.svg
2 parents 2da87e6 + 09c33b5 commit 35fe98b

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)