pavelbannov
d181d43b36
# 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 |
||
---|---|---|
.. | ||
BackgroundTasks | ||
Client | ||
Server |