pavelbannov 570ede7bba Merge branch 'develop' into feature/11.5.2 ... # Conflicts: # common/ASC.Data.Storage/StorageUploader.cs # common/services/ASC.Data.Backup/Service/BackupWorker.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs # web/ASC.Web.Api/Controllers/SettingsController.cs		2021-05-31 13:32:51 +03:00
..
BackupCleanerService.cs	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
BackupSchedulerService.cs	Backup: moved from 08a01422	2021-05-17 21:27:39 +03:00
BackupService.cs	Merge branch 'feature/remove-wq' of github.com:ONLYOFFICE/AppServer into feature/remove-wq	2021-05-13 11:57:40 +03:00
BackupSettings.cs	Backup: moved from 08a01422	2021-05-17 21:27:39 +03:00
BackupWorker.cs	Merge branch 'develop' into feature/11.5.2	2021-05-31 13:32:51 +03:00