pavelbannov ebd4f7d17c Merge branch 'develop' into refactoring/generic-classes ... # Conflicts: # products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs # products/ASC.Files/Core/Core/Thirdparty/ThirdPartyProviderDao.cs # products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs # products/ASC.Files/Core/Utils/FileConverter.cs # products/ASC.Files/Service/Startup.cs		2023-03-20 21:10:08 +03:00
..
ASC.Files	Merge branch 'develop' into refactoring/generic-classes	2023-03-20 21:10:08 +03:00
ASC.People/Server	Merge branch 'develop' into feature/notifications	2023-03-06 15:37:45 +03:00