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
..
Controllers	Merge branch 'develop' into feature/async	2022-01-12 22:07:21 +03:00
Helpers	Merge branch 'develop' into feature/async	2022-01-12 22:07:21 +03:00
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
appsettings.json	Files: Startup	2020-02-12 13:48:58 +03:00
ASC.Files.csproj	Merge branch 'develop' into feature/async	2021-12-02 12:02:50 +03:00
ProductEntryPoint.cs	Api: modules. Added info method	2021-01-25 17:37:26 +03:00
Program.cs	net 6: remove TryUseWindowsService	2021-11-25 16:48:08 +03:00
Startup.cs	Files: fix	2021-10-19 18:37:23 +03:00