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
..
License	Added DIHelper	2020-02-17 11:58:14 +03:00
BillingClient.cs	moved from hotfix/10.5.2	2020-01-17 16:58:26 +03:00
CouponManager.cs	DI: Log. refactoring.	2019-11-06 18:03:09 +03:00
Invoice.cs	init commit	2019-05-15 17:56:09 +03:00
ITariffService.cs	init commit	2019-05-15 17:56:09 +03:00
ITariffSyncService.cs	Code Cleanup	2019-08-15 15:04:42 +03:00
PaymentActive.cs	moved from hotfix/10.5.2	2020-01-17 16:58:26 +03:00
PaymentInfo.cs	IDE0049	2019-08-15 16:16:39 +03:00
Tariff.cs	IDE0019, IDE0020	2019-08-15 16:41:38 +03:00
TariffService.cs	Merge branch 'master' into feature/elastic	2020-02-25 11:24:45 +03:00
TariffState.cs	init commit	2019-05-15 17:56:09 +03:00
TariffSyncClient.cs	Code Cleanup	2019-08-15 15:04:42 +03:00
TariffSyncService.cs	EF: removed old classes	2019-12-23 17:57:21 +03:00
TariffSyncServiceSection.cs	init commit	2019-05-15 17:56:09 +03:00