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 |
||
---|---|---|
.. | ||
Billing | ||
Caching | ||
Configuration | ||
Context | ||
Core | ||
Data | ||
EF | ||
Encryption | ||
Hosting | ||
Log | ||
Messaging | ||
Notify | ||
Properties | ||
protos | ||
Quota | ||
Radicale | ||
Security | ||
Settings | ||
Tenants | ||
Tests | ||
Users | ||
WhiteLabel | ||
ASC.Core.Common.csproj | ||
BaseCommonLinkUtility.cs | ||
ByteConverter.cs | ||
GeolocationHelper.cs | ||
GlobalUsings.cs | ||
HostedSolution.cs | ||
MultiRegionHostedSolution.cs |