Tatiana Lopaeva
40d56075f1
# Conflicts: # common/ASC.Data.Backup.Core/EF/BackupsContext.cs # common/ASC.Data.Backup.Core/Service/BackupWorker.cs # common/services/ASC.Data.Backup/Controllers/BackupController.cs # common/services/ASC.Data.Backup/Startup.cs # packages/asc-web-common/components/PageLayout/sub-components/section-header.js # products/ASC.Files/Client/public/locales/en/OperationsPanel.json # products/ASC.Files/Client/public/locales/en/Settings.json # products/ASC.Files/Client/public/locales/ru/Settings.json # products/ASC.Files/Client/src/components/SimpleFileInput/StyledSimpleFileInput.js # products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js # products/ASC.Files/Client/src/components/panels/SelectFolderInput/StyledSelectFolderInput.js # products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js # products/ASC.Files/Client/src/components/panels/StyledPanels.js # products/ASC.Files/Client/webpack.config.js # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json # web/ASC.Web.Client/webpack.config.js |
||
---|---|---|
.. | ||
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 |