Files
RRJServer/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp
semenov e521ff9186 Merge branch 'add-versionController' into merge-task-and-verController
# Conflicts:
#	InstructorsAndTrainees/CMakeLists.txt
#	InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h
#	InstructorsAndTrainees/instructorsandtraineeswidget.cpp
#	ServerLMS/Systems/updatecontroller.cpp
#	ServerLMS/Systems/updatecontroller.h
2025-01-21 15:52:20 +03:00

12 KiB