pavelbannov 44ec45ebb6 Merge branch 'master' into feature/elastic ... # Conflicts: # common/ASC.Common/Security/Cryptography/InstanceCrypto.cs # common/ASC.Core.Common/Billing/TariffService.cs # common/ASC.Core.Common/Caching/CachedQuotaService.cs # common/ASC.Core.Common/Caching/CachedTenantService.cs # common/ASC.Core.Common/Caching/CachedUserService.cs # common/ASC.Core.Common/Context/Impl/AuthManager.cs # common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs # common/ASC.Core.Common/Context/Impl/TenantManager.cs # common/ASC.Core.Common/Context/SecurityContext.cs # common/ASC.Core.Common/Data/DbSettingsManager.cs # common/ASC.Core.Common/Tenants/TenantUtil.cs # common/ASC.Data.Reassigns/QueueWorker.cs # common/ASC.IPSecurity/IPSecurity.cs # common/services/ASC.Studio.Notify/Program.cs # products/ASC.People/Server/Startup.cs # web/ASC.Web.Core/CookiesManager.cs # web/ASC.Web.Core/Tfa/TfaManager.cs		2020-02-25 11:24:45 +03:00
..
Properties	Common nlog config	2019-11-15 11:47:56 +03:00
.gitignore	init commit	2019-05-15 17:56:09 +03:00
appsettings.json	External config	2019-06-21 11:03:42 +03:00
ASC.Web.Studio.csproj	updated dependecies	2020-02-21 11:13:01 +03:00
Program.cs	Consumers: added config	2019-12-20 14:17:01 +03:00
Startup.cs	Merge branch 'master' into feature/elastic	2020-02-25 11:24:45 +03:00