ASCU_ALL/ApiServer
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
..
.config Work 2021-07-31 22:27:59 +05:00
ApiStruct Send Data 2021-08-02 23:01:18 +05:00
bin Home 2021-08-06 10:39:28 +05:00
Controllers Home 2021-08-06 10:39:28 +05:00
obj Merge branch 'test' of https://git.mbucb.ru/google/ASCKU_PC into test 2021-08-06 10:44:55 +05:00
Properties Home 2021-08-06 10:39:28 +05:00
ApiServer.csproj Work 2021-07-31 22:27:59 +05:00
ApiServer.csproj.user Home 2021-08-01 19:48:09 +05:00
appsettings.Development.json Start API Server 2021-07-30 14:49:24 +05:00
appsettings.json Start API Server 2021-07-30 14:49:24 +05:00
Program.cs Home 2021-08-06 10:39:28 +05:00
Startup.cs Work 2021-07-31 22:27:59 +05:00