pavelbannov
3e6a417d19
# Conflicts: # common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs # migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs # packages/client/src/components/panels/SelectFileDialog/index.js # packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/ButtonComponent.js # packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js # packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js # packages/client/src/store/ProfileActionsStore.js # packages/common/api/files/index.js # packages/common/store/AuthStore.js # web/ASC.Web.Api/Api/AuthenticationController.cs # web/ASC.Web.Api/Api/Settings/SettingsController.cs # yarn.lock |
||
---|---|---|
.. | ||
ASC.ApiCache | ||
ASC.ApiSystem | ||
ASC.AuditTrail | ||
ASC.ClearEvents | ||
ASC.Data.Backup | ||
ASC.Data.Backup.BackgroundTasks | ||
ASC.Data.Storage.Encryption | ||
ASC.ElasticSearch | ||
ASC.Feed.Aggregator | ||
ASC.Notify | ||
ASC.Studio.Notify | ||
ASC.TelegramService |