c74da79ba2
# Conflicts: # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs # products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs # products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs # products/ASC.Files/Core/Services/DocumentService/Configuration.cs # products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs # products/ASC.Files/Core/Utils/EntryManager.cs # products/ASC.Files/Core/Utils/FileUploader.cs # products/ASC.Files/Server/Controllers/FilesController.cs # products/ASC.Files/Server/Helpers/FilesControllerHelper.cs |
||
---|---|---|
.. | ||
ASC.ApiSystem | ||
ASC.AuditTrail | ||
ASC.ClearEvents | ||
ASC.Data.Backup | ||
ASC.Data.Storage.Encryption | ||
ASC.Data.Storage.Migration | ||
ASC.ElasticSearch | ||
ASC.Feed.Aggregator | ||
ASC.Notify | ||
ASC.Radicale | ||
ASC.Socket.IO.Svc | ||
ASC.SsoAuth.Svc | ||
ASC.Studio.Notify | ||
ASC.TelegramService | ||
ASC.Thumbnails.Svc | ||
ASC.UrlShortener.Svc | ||
ASC.Webhooks.Service |