pavelbannov d181d43b36 Merge branch 'develop' into feature/async ... # Conflicts: # common/services/ASC.Data.Backup/ASC.Data.Backup.csproj # products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs # products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs # products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs # products/ASC.Files/Core/Utils/EntryManager.cs # products/ASC.Files/Server/ASC.Files.csproj		2021-12-02 12:02:50 +03:00
..
Contracts	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
Core	Merge branch 'develop' into feature/wizard/migration	2021-09-15 15:52:13 +03:00
EF	Merge branch 'develop' into feature/wizard/migration	2021-09-15 15:52:13 +03:00
Exceptions	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
Extensions	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
Listerners	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
protos	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
Service	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
Storage	Merge branch 'develop' into feature/async	2021-11-22 11:30:38 +03:00
Tasks	Merge branch 'develop' into feature/async	2021-12-02 12:02:50 +03:00
Utils	Merge branch 'develop' into feature/net6	2021-10-22 16:10:37 +03:00
ActionInvoker.cs	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
ASC.Data.Backup.Core.csproj	Removed unused dependencies. Fixed tests	2021-11-24 12:39:39 +03:00
BackupAjaxHandler.cs	renamed providers to lowercase	2021-09-24 17:36:46 +03:00
BackupFileUploadHandler.cs	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
BackupResource.Designer.cs	Merge branch 'develop' into feature/backup.core	2021-09-05 12:50:05 +03:00
BackupResource.resx	backup.core: move backup.core	2021-09-02 15:41:54 +03:00