Zaripov Emil f96d81f660 Merge branch 'master' into develop ... # Conflicts: # backend/pom.xml # distribution/pom.xml # frontend/pom.xml # pom.xml # resources/pom.xml		2024-12-23 10:18:23 +03:00
..
src/main/resources	Merge branch 'master' into develop	2024-12-23 10:18:23 +03:00
pom.xml	set version 1.9.2	2024-12-23 10:16:05 +03:00