ervu-lkrp-ul/config/patches
gulnaz 79833feb75 Merge remote-tracking branch 'origin/release/1.0.0' into release/1.0.0
# 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
2024-09-13 17:12:11 +03:00
..
system Project first commit 2024-06-11 10:58:00 +03:00
add-logger-database.cli Project first commit 2024-06-11 10:58:00 +03:00
default.cli Merge remote-tracking branch 'origin/release/1.0.0' into release/1.0.0 2024-09-13 17:12:11 +03:00