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
..
Controllers	DI: TenantManager	2019-09-17 15:42:32 +03:00
Models	DI: TenantManager	2019-09-17 15:42:32 +03:00
Properties	Getting STORAGE_ROOT from env variable	2019-09-09 18:04:28 +03:00
appsettings.json	External config	2019-06-21 11:03:42 +03:00
ASC.Web.Api.csproj	.net core up to 3.0.0-rc1	2019-09-18 12:29:17 +03:00
ASC.Web.Api.sln	init commit	2019-05-15 17:56:09 +03:00
nlog.config	Added autofac and nlog	2019-05-28 18:05:20 +03:00
Program.cs	kafka disabled by default	2019-08-23 15:49:23 +03:00
Startup.cs	DI: WebImageSupplier,WebItemSettings, SettingsManager	2019-09-11 13:42:52 +03:00