pavelbannov 0000129b3b Merge branch 'master' into feature/release-11.0.0 ... # Conflicts: # common/ASC.Core.Common/Context/WorkContext.cs # common/ASC.Core.Common/Tenants/TenantControlPanelSettings.cs # common/ASC.Core.Common/Tenants/TenantQuota.cs # common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs # common/ASC.Data.Storage/Encryption/Crypt.cs # common/ASC.Data.Storage/Encryption/CryptoStreamWrapper.cs # common/ASC.Data.Storage/Encryption/EncryptionFactory.cs # common/ASC.Data.Storage/Encryption/EncryptionServiceClient.cs # common/ASC.Data.Storage/Encryption/EncryptionSettings.cs # common/ASC.Data.Storage/Encryption/ICrypt.cs # common/ASC.Data.Storage/Encryption/IEncryptionService.cs # common/ASC.Data.Storage/Encryption/IMetadata.cs # common/ASC.Data.Storage/Encryption/IntegrityProtectionException.cs # common/ASC.Data.Storage/Encryption/Metadata.cs # common/ASC.Data.Storage/Encryption/StreamWrapper.cs # config/storage.json # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Core/PublicResources/webstudio_patterns.xml		2020-09-20 20:17:12 +03:00
..
Config	fix	2020-08-27 17:01:37 +03:00
Properties	Consumers: added config	2019-12-20 14:17:01 +03:00
appsettings.json	Added notify service	2019-07-29 12:15:48 +03:00
ASC.Notify.csproj	.net core up to 3.1	2019-12-06 12:12:51 +03:00
DbWorker.cs	moved from release/11 4414f77b	2020-09-18 10:59:23 +03:00
MailSendingState.cs	Added notify service	2019-07-29 12:15:48 +03:00
NotifyCleaner.cs	private: firtst version	2020-08-12 12:58:08 +03:00
NotifySender.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
NotifyService.cs	Encryption: notify fix	2020-09-16 13:50:53 +03:00
NotifyServiceLauncher.cs	private: firtst version	2020-08-12 12:58:08 +03:00
Program.cs	Revert logger	2020-06-04 16:46:58 +03:00