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
..
Builder.cs	Merge branch 'develop' into feature/async	2021-12-02 12:02:50 +03:00
FileData.cs	Files: thumbnails. 2e37dcd0	2021-05-30 21:52:32 +03:00
FileDataProvider.cs	Merge branch 'develop' into feature/async	2021-11-22 11:30:38 +03:00
Launcher.cs	Thumbnail: optimization	2021-08-10 17:54:56 +03:00
Service.cs	Files: thumbnails. 2e37dcd0	2021-05-30 21:52:32 +03:00
ThumbnailSettings.cs	Fixed settings issue	2021-10-29 17:21:51 +03:00
Worker.cs	Fixed settings issue	2021-10-29 17:21:51 +03:00