pavelbannov c171e2c903 Merge branch 'master' into refactoring/di ... # Conflicts: # common/ASC.Api.Core/ASC.Api.Core.csproj # common/ASC.Common/ASC.Common.csproj # common/ASC.Core.Common/ASC.Core.Common.csproj # common/ASC.Data.Storage/ASC.Data.Storage.csproj # common/ASC.FederatedLogin/ASC.FederatedLogin.csproj # common/ASC.IPSecurity/ASC.IPSecurity.csproj # common/ASC.Resource.Manager/ASC.Resource.Manager.csproj # common/ASC.VoipService/ASC.VoipService.csproj # web/ASC.Web.Api/ASC.Web.Api.csproj # web/ASC.Web.Core/ASC.Web.Core.csproj # web/ASC.Web.Studio/ASC.Web.Studio.csproj		2019-09-18 13:32:39 +03:00
..
Auth	DI: TenantManager	2019-09-17 15:42:32 +03:00
Core	DI: ApiDateTime	2019-09-17 18:38:06 +03:00
Middleware	DI: TenantManager	2019-09-17 15:42:32 +03:00
Model	revert f85711b736	2019-09-12 14:34:58 +03:00
Properties	Added ASC.Api.Core.csproj	2019-05-29 17:44:37 +03:00
Routing	Code Cleanup	2019-08-15 15:04:42 +03:00
ASC.Api.Core.csproj	.net core up to 3.0.0-rc1	2019-09-18 12:29:17 +03:00