Tennis-Site

mirror of https://github.com/LOBSTERVOVA/Tennis-Site.git synced 2026-04-17 17:40:49 +03:00

Go to file

Lobstervova a080304b00 Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/example/dateplanner/configurations/SecurityConfig.java
#	src/main/java/com/example/dateplanner/configurations/handlers/JwtAuthenticationManager.java
#	src/main/java/com/example/dateplanner/controllers/advice/SecurityAdviceController.java
#	src/main/java/com/example/dateplanner/controllers/web/AccountController.java
#	src/main/java/com/example/dateplanner/controllers/web/HomeController.java
#	src/main/java/com/example/dateplanner/models/entities/AppUser.java
#	src/main/java/com/example/dateplanner/models/enums/Role.java
#	src/main/java/com/example/dateplanner/services/JwtService.java
#	src/main/java/com/example/dateplanner/services/UserService.java
#	src/main/resources/db/migration/V1_0_1__init.sql
#	src/main/resources/static/css/style.css
#	src/main/resources/static/js/site/blocks/footer.js
#	src/main/resources/static/js/site/blocks/header.js
#	src/main/resources/static/js/site/pages/home/home.js
#	src/main/resources/templates/all-html.html
#	src/main/resources/templates/pages/home.html
#	src/main/resources/templates/template.html

2026-03-31 04:24:33 +03:00