pavelbannov 3e6a417d19 Merge branch 'hotfix/v1.1.2' into develop ... # 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		2023-09-01 15:33:39 +03:00
..
Features	added change-quota-feature-value for CountRoomFeature and FreeFeature	2023-04-05 19:30:59 +05:00
ITenantQuotaFeatureChecker.cs	Merge branch 'hotfix/v1.1.2' into develop	2023-09-01 15:33:39 +03:00
ITenantQuotaFeatureStatistic.cs	CoreDbContext -async	2023-03-14 23:44:44 +03:00
QuotaSocketManager.cs	fix merge	2023-04-10 23:20:16 +03:00
TenantQuotaFeature.cs	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
TenantQuotaFeatureStatHelper.cs	fix merge	2023-04-10 23:20:16 +03:00