Eduard Tihomirov 4891c16316 Merge remote-tracking branch 'origin/feature/SUPPORT-8471_fix_load_okopf' into release/1.0.0 ... # Conflicts: # backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/InteractionLog.java # backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/records/InteractionLogRecord.java # backend/src/main/resources/config/v_1.0/changelog-v_1.0.xml # config/patches/default.cli # config/standalone/dev/standalone.xml		2024-09-13 14:57:11 +03:00
..
standalone.xml	Merge remote-tracking branch 'origin/feature/SUPPORT-8471_fix_load_okopf' into release/1.0.0	2024-09-13 14:57:11 +03:00