pavelbannov a085e8ef38 Merge branch 'master' into feature/release-11.0.0 ... # Conflicts: # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Core/Utility/TenantExtra.cs		2020-09-23 14:00:24 +03:00
..
BackupCleanerService.cs	private: firtst version	2020-08-12 12:58:08 +03:00
BackupSchedulerService.cs	private: firtst version	2020-08-12 12:58:08 +03:00
BackupService.cs	Api: fix	2020-09-23 13:55:39 +03:00
BackupSettings.cs	fix	2020-08-27 17:01:37 +03:00
BackupWorker.cs	ASC.Data.Storage moved from release/11 4414f77b	2020-09-15 18:16:37 +03:00