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
..
BackgroundTasks	net 6: remove TryUseWindowsService	2021-11-25 16:48:08 +03:00
Client	Web: Crm: Changed i18n config	2021-11-10 21:27:02 +03:00
Server	Merge branch 'develop' into feature/async	2021-12-02 12:02:50 +03:00