Zaripov Emil 67214fccdc Merge branch 'master' into develop ... # Conflicts: # backend/pom.xml # distribution/pom.xml # frontend/pom.xml # pom.xml # resources/pom.xml		2024-11-20 11:16:55 +03:00
..
src/main/resources	Merge branch 'master' into develop	2024-11-20 11:16:55 +03:00
pom.xml	set version 1.9.1	2024-11-20 11:14:23 +03:00