Eduard Tihomirov f7e168f80c Merge branch 'master' into develop ... # Conflicts: # backend/pom.xml # backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java # config/micord.env # distribution/pom.xml # frontend/pom.xml # pom.xml # resources/pom.xml		2025-02-03 13:54:09 +03:00
..
tomcat	Merge branch 'master' into develop	2025-02-03 13:54:09 +03:00