Commit Graph

6 Commits

Author SHA1 Message Date
473259657e analizators/s1118 2022-01-21 13:47:56 +03:00
84638feaf0 analizators/U2U1202 2022-01-18 16:54:24 +03:00
4bf841581f Analizators/U2U1104 2022-01-14 16:12:37 +03:00
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
SuhorukovAnton
ab84f48a86 remove-wq: refactoring 2020-10-14 17:26:18 +03:00
SuhorukovAnton
2e4f612f93 remove-wq: fix encryption 2020-10-13 17:28:10 +03:00