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
..
Data	fix	2020-08-27 17:01:37 +03:00
Modules	ASC.Data.Storage moved from release/11 4414f77b	2020-09-15 18:16:37 +03:00
BackupFileInfo.cs	fix	2020-08-27 17:01:37 +03:00
BackupPortalTask.cs	Moved from v10.5.2-saas	2020-09-11 17:12:35 +03:00
ColumnMapper.cs	fix	2020-08-27 17:01:37 +03:00
DbFactory.cs	fix	2020-08-27 17:01:37 +03:00
DeletePortalTask.cs	Backup: ajaxpro removed	2020-06-15 11:19:40 +03:00
KeyHelper.cs	fix	2020-08-27 17:01:37 +03:00
PortalTaskBase.cs	ASC.Data.Storage moved from release/11 4414f77b	2020-09-15 18:16:37 +03:00
RestoreDbModuleTask.cs	Backup: ajaxpro removed	2020-06-15 11:19:40 +03:00
RestorePortalTask.cs	Merge branch 'master' into feature/release-11.0.0	2020-09-20 20:17:12 +03:00
TransferPortalTask.cs	scope: fix	2020-08-24 21:41:06 +03:00