IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1c7d7fee77
DocSpace-buildtools/common/ASC.Notify.Textile/Resources
History
pavelbannov 74d238bde8 Merge branch 'release/v1.2' into develop 
# 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
2022-06-30 16:13:31 +03:00
..
master.htm Notify: fixed textile 2019-09-25 17:25:28 +03:00
NotifyTemplateResource.az.resx az resources 2022-06-27 14:00:23 +03:00
NotifyTemplateResource.bg.resx Notify: Resources 2022-05-12 13:33:04 +03:00
NotifyTemplateResource.cs.resx Notify: Resources 2022-05-12 13:33:04 +03:00
NotifyTemplateResource.de.resx Notify: Resources 2022-05-12 13:33:04 +03:00
NotifyTemplateResource.Designer.cs Merge branch 'release/v1.2' into develop 2022-06-30 16:13:31 +03:00
NotifyTemplateResource.el.resx Notify: Resources 2022-05-12 13:33:04 +03:00
NotifyTemplateResource.es.resx Notify: Resources 2022-05-12 13:33:04 +03:00
NotifyTemplateResource.fi.resx Notify: Resources 2022-05-12 13:33:04 +03:00
NotifyTemplateResource.fr.resx Notify: Resources 2022-05-12 13:33:04 +03:00
NotifyTemplateResource.it.resx Notify: Resources 2022-05-12 13:33:04 +03:00
NotifyTemplateResource.ja.resx Notify: Resources 2022-05-12 13:33:04 +03:00
NotifyTemplateResource.lv.resx Notify: Resources 2022-05-12 13:33:04 +03:00
NotifyTemplateResource.nl.resx Notify: Resources 2022-05-12 13:33:04 +03:00
NotifyTemplateResource.pl.resx Notify: Resources 2022-05-12 13:33:04 +03:00
NotifyTemplateResource.pt-BR.resx Notify: Resources 2022-05-12 13:33:04 +03:00
NotifyTemplateResource.resx Notify: Resources 2022-05-12 13:33:04 +03:00
NotifyTemplateResource.ru.resx Notify: Resources 2022-05-12 13:33:04 +03:00
NotifyTemplateResource.sk.resx Notify: Resources 2022-05-12 13:33:04 +03:00
NotifyTemplateResource.tr.resx Notify: Resources 2022-05-12 13:33:04 +03:00
NotifyTemplateResource.uk.resx Notify: Resources 2022-05-12 13:33:04 +03:00
NotifyTemplateResource.vi.resx Notify: Resources 2022-05-12 13:33:04 +03:00
NotifyTemplateResource.zh-CN.resx Notify: Resources 2022-05-12 13:33:04 +03:00
style.css removed past license headers 2022-03-15 19:59:24 +03:00