Eduard Tihomirov b27eb092f8 Merge branch 'feature/SUPPORT-8427_new' into feature/SUPPORT-8474_id_ervu ... # Conflicts: # Dockerfile # backend/src/main/java/AppConfig.java # backend/src/main/java/esia/config/EsiaConfig.java # backend/src/main/java/esia/controller/EsiaController.java # backend/src/main/java/esia/model/EmployeeModel.java # backend/src/main/java/esia/model/PersonModel.java # backend/src/main/java/esia/service/EsiaAuthService.java # backend/src/main/java/esia/service/UlDataServiceImpl.java		2024-09-04 11:22:30 +03:00
..
src/main/resources	Merge branch 'feature/SUPPORT-8427_new' into feature/SUPPORT-8474_id_ervu	2024-09-04 11:22:30 +03:00
pom.xml	WEBBPMNEXT-9188 change group and artifactId	2024-08-01 15:27:07 +03:00