SL
|
40f3f783c1
|
Merge branch 'develop' into feature/single-session-login
# Conflicts:
# SicRT/Properties/AssemblyInfo.cs
# SicUI/Properties/AssemblyInfo.cs
# ThirdParty/MECF.Framework/MECF.Framework.Common.dll
# ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll
# ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll
# ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll
# ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll
# ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll
# ThirdParty/MECF.Framework/Sicentury.Core.dll
|
2023-09-22 08:52:45 +08:00 |