adel.ka 5a2f67c57f Merge remote-tracking branch 'origin/feature/SUPPORT-9531' into develop ... # Conflicts: # backend/src/main/java/ru/micord/ervu/journal/mapper/JournalDtoMapper.java		2025-11-07 10:59:22 +03:00
..
src/main	Merge remote-tracking branch 'origin/feature/SUPPORT-9531' into develop	2025-11-07 10:59:22 +03:00
pom.xml	SUPPORT-9368: fix from review	2025-10-16 11:11:40 +03:00