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
..
Core	Files: optimization	2020-11-30 23:02:10 +03:00
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
Thumbnail	Merge branch 'develop' into feature/async	2021-12-02 12:02:50 +03:00
appsettings.json	Files: service replaced	2020-04-27 20:02:15 +03:00
ASC.Files.Service.csproj	up to 6.0.0	2021-11-23 17:56:27 +03:00
feed.json	Files: feed. FoldersModule	2020-06-04 19:36:43 +03:00
Program.cs	net 6: remove TryUseWindowsService	2021-11-25 16:48:08 +03:00
search.json	fix	2020-07-16 16:02:21 +03:00