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
..
Actions.cs	moved from release/11 4414f77b	2020-09-18 17:45:59 +03:00
NotifyConfiguration.cs	Merge branch 'master' into feature/scope	2020-09-09 18:18:34 +03:00
SpamEmailSettings.cs	api-defaultvalue: fix	2020-07-02 23:51:18 +03:00
StudioNotifyHelper.cs	private: firtst version	2020-08-12 12:58:08 +03:00
StudioNotifyService.cs	Merge branch 'master' into feature/release-11.0.0	2020-09-20 20:17:12 +03:00
StudioNotifyServiceHelper.cs	fix notify	2020-09-10 12:02:26 +03:00
StudioNotifyServiceSender.cs	scope: refactoring	2020-09-07 15:01:15 +03:00
StudioNotifySource.cs	moved from release/11 4414f77b	2020-09-18 17:45:59 +03:00
StudioPeriodicNotify.cs	moved from release/11 4414f77b	2020-09-18 17:45:59 +03:00
StudioSubscriptionManager.cs	fix	2020-08-27 17:01:37 +03:00
StudioWhatsNewNotify.cs	scope: refactoring	2020-09-07 15:01:15 +03:00
Tags.cs	moved from release/11 4414f77b	2020-09-18 17:45:59 +03:00
TagValues.cs	fix	2020-08-27 17:01:37 +03:00