adel.ka 1b0fb3e1bb Merge remote-tracking branch 'origin/feature/SUPPORT-9339_add_sign_verify' into feature/SUPPORT-9368_journal_new_version ... # Conflicts: # backend/src/main/java/ru/micord/ervu/journal/JournalDto.java # backend/src/main/java/ru/micord/ervu/journal/JournalFileInfo.java # backend/src/main/java/ru/micord/ervu/journal/mapper/JournalDtoMapper.java # resources/src/main/resources/business-model/Журнал взаимодействия.page		2025-10-20 10:45:39 +03:00
..
src/main	Merge remote-tracking branch 'origin/feature/SUPPORT-9339_add_sign_verify' into feature/SUPPORT-9368_journal_new_version	2025-10-20 10:45:39 +03:00
pom.xml	SUPPORT-9368: fix from review	2025-10-16 11:11:40 +03:00