pavelbannov
d01db1eed6
# 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 |
||
---|---|---|
.. | ||
EncryptionFactory.cs | ||
EncryptionOperation.cs | ||
EncryptionServiceClient.cs | ||
EncryptionWorker.cs | ||
FakeCrypt.cs | ||
IEncryptionService.cs | ||
NotifyHelper.cs |