# Conflicts: # backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java # backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java # config/patches/default.cli # config/standalone/dev/standalone.xml # frontend/src/resources/app-config.json # resources/src/main/resources/business-model/Журнал взаимодействия.page |
||
|---|---|---|
| .. | ||
| system | ||
| add-logger-database.cli | ||
| default.cli | ||