pavelbannov d01db1eed6 Merge branch 'feature/remove-wq' of github.com:ONLYOFFICE/AppServer into feature/remove-wq ... # Conflicts: # common/ASC.Data.Storage/Encryption/EncryptionOperation.cs # common/ASC.Data.Storage/Encryption/EncryptionServiceNotifier.cs # common/ASC.Data.Storage/Encryption/EncryptionWorker.cs # common/ASC.Data.Storage/StaticUploader.cs # common/services/ASC.Data.Backup/BackupAjaxHandler.cs # common/services/ASC.Data.Backup/Service/BackupService.cs # web/ASC.Web.Api/Controllers/SettingsController.cs		2021-05-13 11:57:40 +03:00
..
EncryptionFactory.cs	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
EncryptionOperation.cs	Merge branch 'feature/remove-wq' of github.com:ONLYOFFICE/AppServer into feature/remove-wq	2021-05-13 11:57:40 +03:00
EncryptionServiceClient.cs	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
EncryptionWorker.cs	Merge branch 'feature/remove-wq' of github.com:ONLYOFFICE/AppServer into feature/remove-wq	2021-05-13 11:57:40 +03:00
FakeCrypt.cs	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
IEncryptionService.cs	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
NotifyHelper.cs	Merge branch 'feature/remove-wq' of github.com:ONLYOFFICE/AppServer into feature/remove-wq	2021-05-13 11:57:40 +03:00