kochetkov 805a40b79b Merge branch 'hotfix/1.9.6' into develop ... # Conflicts: # backend/pom.xml # distribution/pom.xml # frontend/package-lock.json # frontend/pom.xml # pom.xml # resources/pom.xml		2025-01-16 15:13:56 +03:00
..
src/main/resources	Merge branch 'hotfix/1.9.6' into develop	2025-01-16 15:13:56 +03:00
pom.xml	set version 1.9.6-SNAPSHOT	2025-01-16 10:19:18 +03:00