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
..
AccountLinkContext.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
BaseDbContext.cs	EF: GetKeys - is now public	2020-02-21 14:23:56 +03:00
ConfigureDbContext.cs	EF: MultiRegionalDbManager	2019-12-16 17:55:59 +03:00
CoreDbContext.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
DbContext.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
DbContextManager.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
FeedDbContext.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
FilesDbContext.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
MailDbContext.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
MessagesContext.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
NotifyDbContext.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
ResourceDbContext.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
TenantDbContext.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
UserDbContext.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
VoipDbContext.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
WebstudioDbContext.cs	Added DIHelper	2020-02-17 11:58:14 +03:00