ervu-lkrp-fl/resources
gulnaz 46282d6283 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	backend/pom.xml
#	backend/src/main/java/ru/micord/ervu/controller/ExtractController.java
#	backend/src/main/java/ru/micord/ervu/kafka/service/impl/BaseReplyingKafkaService.java
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
#	config/standalone/dev/standalone.xml
#	distribution/pom.xml
#	frontend/pom.xml
#	pom.xml
#	resources/pom.xml
2025-02-24 17:28:43 +03:00
..
src/main/resources Merge remote-tracking branch 'origin/master' into develop 2025-02-24 17:28:43 +03:00
pom.xml set version 1.9.8 2025-02-24 14:53:57 +03:00