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
..
Controllers	fix	2021-12-01 14:09:02 +03:00
DocStore@9fea7818de	Store updated	2021-11-25 10:29:27 +03:00
Helpers	Merge branch 'develop' into feature/async	2021-12-02 12:02:50 +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