pavelbannov
d01db1eed6
# Conflicts: # common/ASC.Data.Storage/Encryption/EncryptionOperation.cs # common/ASC.Data.Storage/Encryption/EncryptionServiceNotifier.cs # common/ASC.Data.Storage/Encryption/EncryptionWorker.cs # common/ASC.Data.Storage/StaticUploader.cs # common/services/ASC.Data.Backup/BackupAjaxHandler.cs # common/services/ASC.Data.Backup/Service/BackupService.cs # web/ASC.Web.Api/Controllers/SettingsController.cs |
||
---|---|---|
.. | ||
ASC.ApiSystem | ||
ASC.AuditTrail | ||
ASC.Data.Backup | ||
ASC.Data.Storage.Encryption | ||
ASC.Data.Storage.Migration | ||
ASC.ElasticSearch | ||
ASC.Feed.Aggregator | ||
ASC.Notify | ||
ASC.Socket.IO.Svc | ||
ASC.Studio.Notify | ||
ASC.TelegramService | ||
ASC.Thumbnails.Svc | ||
ASC.UrlShortener.Svc |