Eduard Tihomirov 4a57d604db Merge remote-tracking branch 'origin/release/1.8' into feature/SUPPORT-8579_access_marker ... # Conflicts: # backend/src/main/java/ru/micord/ervu/security/esia/controller/EsiaController.java # backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/service/JwtTokenService.java		2024-10-23 12:06:24 +03:00
..
standalone.xml	Merge remote-tracking branch 'origin/release/1.8' into feature/SUPPORT-8579_access_marker	2024-10-23 12:06:24 +03:00