pavelbannov
74d238bde8
# Conflicts: # common/ASC.Common/Caching/KafkaCache.cs # common/ASC.Common/Logging/Log.cs # common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs # common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs # common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj # common/ASC.Data.Backup.Core/BackupResource.Designer.cs # common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.cs # common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs # common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs # common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs # common/ASC.Data.Storage/S3/S3Storage.cs # common/ASC.Notify.Textile/ASC.Notify.Textile.csproj # common/services/ASC.AuditTrail/ASC.AuditTrail.csproj # products/ASC.Files/Core/ASC.Files.Core.csproj # products/ASC.Files/Core/Core/Compress/CompressToArchive.cs # products/ASC.Files/Core/Core/Compress/CompressToTarGz.cs # products/ASC.Files/Core/Core/Compress/CompressToZip.cs # products/ASC.Files/Core/Core/Compress/ICompress.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs # products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs # products/ASC.Files/Core/Helpers/Global.cs # products/ASC.Files/Core/Resources/FilesJSResource.Designer.cs # products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs # products/ASC.Files/Core/Utils/EntryManager.cs # web/ASC.Web.Api/ASC.Web.Api.csproj # web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs # web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs |
||
---|---|---|
.. | ||
master.htm | ||
NotifyTemplateResource.az.resx | ||
NotifyTemplateResource.bg.resx | ||
NotifyTemplateResource.cs.resx | ||
NotifyTemplateResource.de.resx | ||
NotifyTemplateResource.Designer.cs | ||
NotifyTemplateResource.el.resx | ||
NotifyTemplateResource.es.resx | ||
NotifyTemplateResource.fi.resx | ||
NotifyTemplateResource.fr.resx | ||
NotifyTemplateResource.it.resx | ||
NotifyTemplateResource.ja.resx | ||
NotifyTemplateResource.lv.resx | ||
NotifyTemplateResource.nl.resx | ||
NotifyTemplateResource.pl.resx | ||
NotifyTemplateResource.pt-BR.resx | ||
NotifyTemplateResource.resx | ||
NotifyTemplateResource.ru.resx | ||
NotifyTemplateResource.sk.resx | ||
NotifyTemplateResource.tr.resx | ||
NotifyTemplateResource.uk.resx | ||
NotifyTemplateResource.vi.resx | ||
NotifyTemplateResource.zh-CN.resx | ||
style.css |