pavelbannov
44ec45ebb6
# 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 |
||
---|---|---|
.. | ||
Billing | ||
Caching | ||
Configuration | ||
Context | ||
Contracts | ||
Core | ||
Data | ||
EF | ||
Notify | ||
Properties | ||
protos | ||
Security | ||
Settings | ||
Tenants | ||
Tests | ||
Users | ||
WhiteLabel | ||
ASC.Core.Common.csproj | ||
BaseCommonLinkUtility.cs | ||
GeolocationHelper.cs | ||
HostedSolution.cs | ||
MultiRegionHostedSolution.cs |