Vashchuk Nikita c74da79ba2 Merge branch 'develop' into feature/async ... # Conflicts: # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs # products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs # products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs # products/ASC.Files/Core/Services/DocumentService/Configuration.cs # products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs # products/ASC.Files/Core/Utils/EntryManager.cs # products/ASC.Files/Core/Utils/FileUploader.cs # products/ASC.Files/Server/Controllers/FilesController.cs # products/ASC.Files/Server/Helpers/FilesControllerHelper.cs		2022-01-12 22:07:21 +03:00
..
ASC.Calendar	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
ASC.CRM	Merge branch 'develop' into feature/async	2022-01-12 22:07:21 +03:00
ASC.Files	Merge branch 'develop' into feature/async	2022-01-12 22:07:21 +03:00
ASC.Mail	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
ASC.People	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
ASC.Projects	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00