Georgy Khatuncev 78b2f5ac24 Merge branch 'test' of https://git.mbucb.ru/google/ASCKU_PC into test ... # Conflicts: # .vs/ASCKU Projects/DesignTimeBuild/.dtbcache.v2 # .vs/ASCKU Projects/v16/.suo # ApiServer/obj/Debug/net5.0/ApiServer.csproj.AssemblyReference.cache # ClientCollector/obj/Debug/net5.0/ClientCollector.csproj.AssemblyReference.cache # DataClient/obj/Release/net5.0/DataClient.csproj.AssemblyReference.cache # DataClients/obj/Release/netstandard2.0/DataClients.csproj.AssemblyReference.cache # Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache # Mailing/obj/Release/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache # PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.csproj.AssemblyReference.cache # PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.csproj.AssemblyReference.cache # SupportClasses/obj/Release/netstandard2.0/SupportClasses.csproj.AssemblyReference.cache # Test2/obj/Debug/net5.0/Test2.csproj.AssemblyReference.cache # Test2/obj/Release/net5.0/Test2.csproj.AssemblyReference.cache # Tests/obj/Debug/netcoreapp3.1/Tests.csproj.AssemblyReference.cache # Tests/obj/Release/netcoreapp3.1/Tests.csproj.AssemblyReference.cache # test3/obj/Debug/net5.0/test3.csproj.AssemblyReference.cache # test3/obj/Release/net5.0/test3.csproj.AssemblyReference.cache		2021-08-06 10:44:55 +05:00
..
bin/Release/netstandard2.0	Work	2021-08-03 11:34:44 +05:00
obj	Merge branch 'test' of https://git.mbucb.ru/google/ASCKU_PC into test	2021-08-06 10:44:55 +05:00
DataClients.csproj	work	2021-06-04 16:57:32 +05:00
DataClients.xml	Start API Server	2021-07-30 14:49:24 +05:00
DataClientSrc.xml	work	2021-06-04 16:57:32 +05:00
FileClient.cs	Create Socket	2021-05-28 20:51:55 +05:00
NetClient.cs	work	2021-06-02 20:58:38 +05:00
STPClient.cs	Test	2021-05-25 17:00:45 +05:00
TempDir.cs	Part1	2020-11-18 16:56:28 +05:00
Variables.cs	Test	2021-05-25 17:00:45 +05:00