gulnaz cabde7f04d Merge remote-tracking branch 'origin/master' into develop ... # Conflicts: # backend/pom.xml # backend/src/main/java/ru/micord/ervu/kafka/controller/ErvuKafkaController.java # backend/src/main/java/ru/micord/ervu/kafka/exception/ExcerptException.java # backend/src/main/java/ru/micord/ervu/kafka/service/impl/BaseReplyingKafkaServiceImpl.java # backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java # distribution/pom.xml # frontend/pom.xml # pom.xml # resources/pom.xml		2025-02-24 16:33:50 +03:00
..
standalone.xml	Merge remote-tracking branch 'origin/master' into develop	2025-02-24 16:33:50 +03:00