gulnaz 0069dcfa5a Merge branch 'master' into develop ... # Conflicts: # backend/pom.xml # backend/src/main/java/ru/micord/ervu/kafka/service/impl/BaseReplyingKafkaService.java # backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java # backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaPersonalDataService.java # backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/service/JwtTokenService.java # config/local.env # distribution/pom.xml # frontend/pom.xml # pom.xml # resources/pom.xml		2025-02-17 12:58:14 +03:00
..
src/main	Merge branch 'master' into develop	2025-02-17 12:58:14 +03:00
pom.xml	Merge branch 'hotfix/1.9.5'	2025-02-07 10:16:59 +03:00