Zaripov Emil f1a5ef66b4 Merge branch 'master' into develop ... # Conflicts: # backend/pom.xml # distribution/pom.xml # frontend/pom.xml # pom.xml # resources/pom.xml		2024-11-20 10:22:52 +03:00
..
resources	Merge branch 'master' into develop	2024-11-20 10:22:52 +03:00
ts	fix EsiaError	2024-11-19 11:26:09 +03:00